From 300d172ba4e40a3455fea124609c08c19b0a2bf6 Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Tue, 10 Apr 2012 17:24:41 -0700 Subject: [PATCH] [WVDRM] Reorg of binary libs into proc-specific folders Rahul's changes in preparation for adding x86 support Change-Id: Ib51dfa72291857c44be37595be2205dd040fc0dd related-to-bug: 6276794 --- proprietary/Android.mk | 4 +- proprietary/drmwvmplugin/Android.mk | 2 +- proprietary/drmwvmplugin/common.mk | 4 ++ proprietary/drmwvmplugin/lib/Android.mk | 34 +---------------- proprietary/drmwvmplugin/lib/arm/Android.mk | 35 ++++++++++++++++++ .../drmwvmplugin/lib/{ => arm}/libwvdrm_L1.so | Bin .../drmwvmplugin/lib/{ => arm}/libwvdrm_L3.so | Bin .../drmwvmplugin/lib/{ => arm}/libwvocs_L1.a | Bin .../drmwvmplugin/lib/{ => arm}/libwvocs_L3.a | Bin proprietary/drmwvmplugin/lib/x86/Android.mk | 35 ++++++++++++++++++ proprietary/drmwvmplugin/test/Android.mk | 6 ++- proprietary/streamcontrol/lib/Android.mk | 17 +-------- proprietary/streamcontrol/lib/arm/Android.mk | 18 +++++++++ .../lib/{ => arm}/libWVStreamControlAPI_L1.so | Bin .../lib/{ => arm}/libWVStreamControlAPI_L3.so | Bin proprietary/streamcontrol/lib/x86/Android.mk | 18 +++++++++ proprietary/streamcontrol/test/Android.mk | 6 ++- proprietary/wvm/Android.mk | 2 +- proprietary/wvm/common.mk | 3 ++ proprietary/wvm/test/Android.mk | 6 ++- proprietary/wvm/wvm-core.mk | 3 ++ 21 files changed, 139 insertions(+), 54 deletions(-) create mode 100644 proprietary/drmwvmplugin/lib/arm/Android.mk rename proprietary/drmwvmplugin/lib/{ => arm}/libwvdrm_L1.so (100%) rename proprietary/drmwvmplugin/lib/{ => arm}/libwvdrm_L3.so (100%) rename proprietary/drmwvmplugin/lib/{ => arm}/libwvocs_L1.a (100%) rename proprietary/drmwvmplugin/lib/{ => arm}/libwvocs_L3.a (100%) create mode 100644 proprietary/drmwvmplugin/lib/x86/Android.mk create mode 100644 proprietary/streamcontrol/lib/arm/Android.mk rename proprietary/streamcontrol/lib/{ => arm}/libWVStreamControlAPI_L1.so (100%) rename proprietary/streamcontrol/lib/{ => arm}/libWVStreamControlAPI_L3.so (100%) create mode 100644 proprietary/streamcontrol/lib/x86/Android.mk diff --git a/proprietary/Android.mk b/proprietary/Android.mk index a3b671c2..c4ed5602 100644 --- a/proprietary/Android.mk +++ b/proprietary/Android.mk @@ -1,6 +1,6 @@ # widevine prebuilts only available for ARM -ifeq ($(TARGET_ARCH),arm) +ifneq ($(filter arm x86,$(TARGET_ARCH)),) include $(call all-subdir-makefiles) -endif # TARGET_ARCH == arm +endif # TARGET_ARCH == arm, x86 diff --git a/proprietary/drmwvmplugin/Android.mk b/proprietary/drmwvmplugin/Android.mk index 611fcade..7a31720c 100644 --- a/proprietary/drmwvmplugin/Android.mk +++ b/proprietary/drmwvmplugin/Android.mk @@ -31,7 +31,7 @@ include $(BUILD_JAVA_LIBRARY) ######################## -ifeq ($(TARGET_ARCH),arm) +ifneq ($(filter arm x86,$(TARGET_ARCH)),) include $(CLEAR_VARS) include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/common.mk diff --git a/proprietary/drmwvmplugin/common.mk b/proprietary/drmwvmplugin/common.mk index 1940570d..ca35d211 100644 --- a/proprietary/drmwvmplugin/common.mk +++ b/proprietary/drmwvmplugin/common.mk @@ -7,3 +7,7 @@ LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/av/drm/libdrmframework/include \ $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include \ $(TOP)/frameworks/av/include + +ifeq ($(TARGET_ARCH),x86) +LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86 +endif diff --git a/proprietary/drmwvmplugin/lib/Android.mk b/proprietary/drmwvmplugin/lib/Android.mk index ee6d308a..8a9c12a2 100644 --- a/proprietary/drmwvmplugin/lib/Android.mk +++ b/proprietary/drmwvmplugin/lib/Android.mk @@ -1,35 +1,5 @@ -ifeq ($(TARGET_ARCH),arm) +ifneq ($(filter arm x86,$(TARGET_ARCH)),) -LOCAL_PATH:= $(call my-dir) - -######################################################################### -# libwvdrm_L?.so - -include $(CLEAR_VARS) -include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk - -LOCAL_MODULE := libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL) -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_SUFFIX := .so -LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) -LOCAL_PROPRIETARY_MODULE := true -LOCAL_STRIP_MODULE := true - -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) - -######################################################################### -# libwvocs_L?.a - -include $(CLEAR_VARS) -include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk - -LOCAL_MODULE := libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL) -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE_SUFFIX := .a -LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) - -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) +include $(call all-subdir-makefiles) endif diff --git a/proprietary/drmwvmplugin/lib/arm/Android.mk b/proprietary/drmwvmplugin/lib/arm/Android.mk new file mode 100644 index 00000000..ee6d308a --- /dev/null +++ b/proprietary/drmwvmplugin/lib/arm/Android.mk @@ -0,0 +1,35 @@ +ifeq ($(TARGET_ARCH),arm) + +LOCAL_PATH:= $(call my-dir) + +######################################################################### +# libwvdrm_L?.so + +include $(CLEAR_VARS) +include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk + +LOCAL_MODULE := libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL) +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_SUFFIX := .so +LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) +LOCAL_PROPRIETARY_MODULE := true +LOCAL_STRIP_MODULE := true + +LOCAL_MODULE_TAGS := optional +include $(BUILD_PREBUILT) + +######################################################################### +# libwvocs_L?.a + +include $(CLEAR_VARS) +include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk + +LOCAL_MODULE := libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL) +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE_SUFFIX := .a +LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) + +LOCAL_MODULE_TAGS := optional +include $(BUILD_PREBUILT) + +endif diff --git a/proprietary/drmwvmplugin/lib/libwvdrm_L1.so b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so similarity index 100% rename from proprietary/drmwvmplugin/lib/libwvdrm_L1.so rename to proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so diff --git a/proprietary/drmwvmplugin/lib/libwvdrm_L3.so b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so similarity index 100% rename from proprietary/drmwvmplugin/lib/libwvdrm_L3.so rename to proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so diff --git a/proprietary/drmwvmplugin/lib/libwvocs_L1.a b/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a similarity index 100% rename from proprietary/drmwvmplugin/lib/libwvocs_L1.a rename to proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a diff --git a/proprietary/drmwvmplugin/lib/libwvocs_L3.a b/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a similarity index 100% rename from proprietary/drmwvmplugin/lib/libwvocs_L3.a rename to proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a diff --git a/proprietary/drmwvmplugin/lib/x86/Android.mk b/proprietary/drmwvmplugin/lib/x86/Android.mk new file mode 100644 index 00000000..69ea5798 --- /dev/null +++ b/proprietary/drmwvmplugin/lib/x86/Android.mk @@ -0,0 +1,35 @@ +ifeq ($(TARGET_ARCH),x86) + +LOCAL_PATH:= $(call my-dir) + +######################################################################### +# libwvdrm_L?.so + +include $(CLEAR_VARS) +include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk + +LOCAL_MODULE := libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL) +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_SUFFIX := .so +LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) +LOCAL_PROPRIETARY_MODULE := true +LOCAL_STRIP_MODULE := true + +LOCAL_MODULE_TAGS := optional +include $(BUILD_PREBUILT) + +######################################################################### +# libwvocs_L?.a + +include $(CLEAR_VARS) +include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk + +LOCAL_MODULE := libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL) +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE_SUFFIX := .a +LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) + +LOCAL_MODULE_TAGS := optional +include $(BUILD_PREBUILT) + +endif diff --git a/proprietary/drmwvmplugin/test/Android.mk b/proprietary/drmwvmplugin/test/Android.mk index 3895b9fa..1e1e1285 100644 --- a/proprietary/drmwvmplugin/test/Android.mk +++ b/proprietary/drmwvmplugin/test/Android.mk @@ -1,4 +1,4 @@ -ifeq ($(TARGET_ARCH),arm) +ifneq ($(filter arm x86,$(TARGET_ARCH)),) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -16,6 +16,10 @@ LOCAL_C_INCLUDES+= \ frameworks/av/drm/libdrmframework/include \ frameworks/av/drm/libdrmframework/plugins/common/include +ifeq ($(TARGET_ARCH),x86) +LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86 +endif + LOCAL_SHARED_LIBRARIES := \ libstlport \ liblog \ diff --git a/proprietary/streamcontrol/lib/Android.mk b/proprietary/streamcontrol/lib/Android.mk index 095b249a..8a9c12a2 100644 --- a/proprietary/streamcontrol/lib/Android.mk +++ b/proprietary/streamcontrol/lib/Android.mk @@ -1,18 +1,5 @@ -ifeq ($(TARGET_ARCH),arm) +ifneq ($(filter arm x86,$(TARGET_ARCH)),) -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk - -LOCAL_MODULE := libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL) -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_SUFFIX := .so -LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) -LOCAL_PROPRIETARY_MODULE := true -LOCAL_STRIP_MODULE := true - -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) +include $(call all-subdir-makefiles) endif diff --git a/proprietary/streamcontrol/lib/arm/Android.mk b/proprietary/streamcontrol/lib/arm/Android.mk new file mode 100644 index 00000000..095b249a --- /dev/null +++ b/proprietary/streamcontrol/lib/arm/Android.mk @@ -0,0 +1,18 @@ +ifeq ($(TARGET_ARCH),arm) + +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) +include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk + +LOCAL_MODULE := libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL) +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_SUFFIX := .so +LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) +LOCAL_PROPRIETARY_MODULE := true +LOCAL_STRIP_MODULE := true + +LOCAL_MODULE_TAGS := optional +include $(BUILD_PREBUILT) + +endif diff --git a/proprietary/streamcontrol/lib/libWVStreamControlAPI_L1.so b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so similarity index 100% rename from proprietary/streamcontrol/lib/libWVStreamControlAPI_L1.so rename to proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so diff --git a/proprietary/streamcontrol/lib/libWVStreamControlAPI_L3.so b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so similarity index 100% rename from proprietary/streamcontrol/lib/libWVStreamControlAPI_L3.so rename to proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so diff --git a/proprietary/streamcontrol/lib/x86/Android.mk b/proprietary/streamcontrol/lib/x86/Android.mk new file mode 100644 index 00000000..225f5fc9 --- /dev/null +++ b/proprietary/streamcontrol/lib/x86/Android.mk @@ -0,0 +1,18 @@ +ifeq ($(TARGET_ARCH),x86) + +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) +include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk + +LOCAL_MODULE := libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL) +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_SUFFIX := .so +LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) +LOCAL_PROPRIETARY_MODULE := true +LOCAL_STRIP_MODULE := true + +LOCAL_MODULE_TAGS := optional +include $(BUILD_PREBUILT) + +endif diff --git a/proprietary/streamcontrol/test/Android.mk b/proprietary/streamcontrol/test/Android.mk index 2e7a41f3..16ab107d 100644 --- a/proprietary/streamcontrol/test/Android.mk +++ b/proprietary/streamcontrol/test/Android.mk @@ -1,4 +1,4 @@ -ifeq ($(TARGET_ARCH),arm) +ifneq ($(filter arm x86,$(TARGET_ARCH)),) LOCAL_PATH:= $(call my-dir) @@ -19,6 +19,10 @@ LOCAL_C_INCLUDES += \ frameworks/av/drm/libdrmframework/include \ frameworks/av/drm/libdrmframework/plugins/common/include +ifeq ($(TARGET_ARCH),x86) +LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86 +endif + LOCAL_SHARED_LIBRARIES := \ libstlport \ libdrmframework \ diff --git a/proprietary/wvm/Android.mk b/proprietary/wvm/Android.mk index dbbf63a5..c3237d90 100644 --- a/proprietary/wvm/Android.mk +++ b/proprietary/wvm/Android.mk @@ -1,4 +1,4 @@ -ifeq ($(TARGET_ARCH),arm) +ifneq ($(filter arm x86,$(TARGET_ARCH)),) LOCAL_PATH := $(call my-dir) diff --git a/proprietary/wvm/common.mk b/proprietary/wvm/common.mk index e90598cf..a8517655 100644 --- a/proprietary/wvm/common.mk +++ b/proprietary/wvm/common.mk @@ -6,3 +6,6 @@ LOCAL_C_INCLUDES:= \ vendor/widevine/proprietary/streamcontrol/include \ vendor/widevine/proprietary/wvm/include +ifeq ($(TARGET_ARCH),x86) +LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86 +endif diff --git a/proprietary/wvm/test/Android.mk b/proprietary/wvm/test/Android.mk index 32544737..aa15b53c 100644 --- a/proprietary/wvm/test/Android.mk +++ b/proprietary/wvm/test/Android.mk @@ -1,4 +1,4 @@ -ifeq ($(TARGET_ARCH),arm) +ifneq ($(filter arm x86,$(TARGET_ARCH)),) LOCAL_PATH:= $(call my-dir) @@ -13,6 +13,10 @@ LOCAL_C_INCLUDES+= \ external/stlport/stlport \ frameworks/av/media/libstagefright +ifeq ($(TARGET_ARCH),x86) +LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86 +endif + LOCAL_SHARED_LIBRARIES := \ libstlport \ libdrmframework \ diff --git a/proprietary/wvm/wvm-core.mk b/proprietary/wvm/wvm-core.mk index a9622c46..161ba46b 100644 --- a/proprietary/wvm/wvm-core.mk +++ b/proprietary/wvm/wvm-core.mk @@ -19,3 +19,6 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libz +ifeq ($(TARGET_ARCH),x86) +LOCAL_SHARED_LIBRARIES += libdl +endif