| author | Tellen Yu <tellen.yu@amlogic.com> | 2018-02-24 05:13:14 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@li1005-239.members.linode.com> | 2018-02-24 05:13:14 (GMT) |
| commit | 0ca72e0bbd13b602f9f7ff8c0b47c4d91d4c9035 (patch) | |
| tree | 32cc83e03cbeca212d006bc9ee21cd65a9bb1a17 | |
| parent | e9e90a1efcb1e2904ed38addb6ffe25445635829 (diff) | |
| parent | 61c62fd3f8e3f7a9dd85e59424824d3bf8be267a (diff) | |
| download | ampere-0ca72e0bbd13b602f9f7ff8c0b47c4d91d4c9035.zip ampere-0ca72e0bbd13b602f9f7ff8c0b47c4d91d4c9035.tar.gz ampere-0ca72e0bbd13b602f9f7ff8c0b47c4d91d4c9035.tar.bz2 | |
Merge "ampere: generate the intermediate file to out directory [2/2]" into o-amlogic
| -rw-r--r-- | playready/Android.mk | 6 | ||||
| -rw-r--r-- | widevine/secmem/Android.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/playready/Android.mk b/playready/Android.mk index 0dd92b6..6888b61 100644 --- a/playready/Android.mk +++ b/playready/Android.mk @@ -47,11 +47,11 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := 9a04f079-9840-4286-ab92e65be0885f95 ifeq ($(TARGET_ENABLE_TA_SIGN), true) -$(info $(shell mkdir $(ANDROID_BUILD_TOP)/$(LOCAL_PATH)/mediadrmplugin/TVP/signed)) +$(info $(shell mkdir -p $(ANDROID_BUILD_TOP)/$(PRODUCT_OUT)/signed/mediadrmplugin/TVP)) $(info $(shell $(ANDROID_BUILD_TOP)/$(BOARD_AML_VENDOR_PATH)/tdk/ta_export/scripts/sign_ta_auto.py \ --in=$(ANDROID_BUILD_TOP)/$(LOCAL_PATH)/mediadrmplugin/TVP/9a04f079-9840-4286-ab92e65be0885f95.ta \ - --out=$(ANDROID_BUILD_TOP)/$(LOCAL_PATH)/mediadrmplugin/TVP/signed/9a04f079-9840-4286-ab92e65be0885f95.ta)) -LOCAL_SRC_FILES := mediadrmplugin/TVP/signed/9a04f079-9840-4286-ab92e65be0885f95.ta + --out=$(ANDROID_BUILD_TOP)/$(PRODUCT_OUT)/signed/mediadrmplugin/TVP/9a04f079-9840-4286-ab92e65be0885f95.ta)) +LOCAL_SRC_FILES := ../../../../$(PRODUCT_OUT)/signed/mediadrmplugin/TVP/9a04f079-9840-4286-ab92e65be0885f95.ta else LOCAL_SRC_FILES := mediadrmplugin/TVP/9a04f079-9840-4286-ab92e65be0885f95.ta endif diff --git a/widevine/secmem/Android.mk b/widevine/secmem/Android.mk index 8405d02..b354987 100644 --- a/widevine/secmem/Android.mk +++ b/widevine/secmem/Android.mk @@ -26,11 +26,11 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/teetz LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_SUFFIX := .ta ifeq ($(TARGET_ENABLE_TA_SIGN), true) -$(info $(shell mkdir $(ANDROID_BUILD_TOP)/$(LOCAL_PATH)/signed)) +$(info $(shell mkdir -p $(ANDROID_BUILD_TOP)/$(PRODUCT_OUT)/signed/secmem)) $(info $(shell $(ANDROID_BUILD_TOP)/$(BOARD_AML_VENDOR_PATH)/tdk/ta_export/scripts/sign_ta_auto.py \ --in=$(ANDROID_BUILD_TOP)/$(LOCAL_PATH)/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) \ - --out=$(ANDROID_BUILD_TOP)/$(LOCAL_PATH)/signed/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX))) -LOCAL_SRC_FILES := signed/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) + --out=$(ANDROID_BUILD_TOP)/$(PRODUCT_OUT)/signed/secmem/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX))) +LOCAL_SRC_FILES := ../../../../../$(PRODUCT_OUT)/signed/secmem/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) else LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) endif |