| -rw-r--r-- | core_amlogic.mk | 8 | ||||
| -rw-r--r-- | factory.mk | 8 | ||||
| -rw-r--r-- | init.amlogic.wifi.rc | 2 | ||||
| -rw-r--r-- | media.mk | 9 | ||||
| -rw-r--r-- | products/mbox/init.amlogic.rc | 10 | ||||
| -rw-r--r-- | products/tablet/init.amlogic.rc | 10 | ||||
| -rw-r--r-- | products/tv/init.amlogic.rc | 10 | ||||
| -rw-r--r-- | recovery/ubootenv/Android.mk | 2 | ||||
| -rw-r--r-- | software.mk | 3 | ||||
| -rw-r--r-- | wifi.mk | 265 |
10 files changed, 115 insertions, 212 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index 8c6c006..313fe4b 100644 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -128,7 +128,7 @@ $(call inherit-product, build/target/product/core_base.mk) #default hardware composer version is 2.0 TARGET_USES_HWC2 := true -ifneq ($(wildcard vendor/amlogic/frameworks/av/LibPlayer),) +ifneq ($(wildcard $(BOARD_AML_VENDOR_PATH)/frameworks/av/LibPlayer),) WITH_LIBPLAYER_MODULE := true else WITH_LIBPLAYER_MODULE := false @@ -291,9 +291,13 @@ PRODUCT_COPY_FILES += \ # ######################################################################### ifeq ($(TARGET_USE_OPTEEOS),true) +ifeq ($(TARGET_KERNEL_BUILT_FROM_SOURCE), true) PRODUCT_PACKAGES += \ optee_armtz \ - optee \ + optee +endif + +PRODUCT_PACKAGES += \ tee-supplicant \ libteec \ tee_helloworld \ |