StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4170e2be: am fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev

Browse Source 
* commit '4170e2be8e7493f2ad1abd33ba74638d9d421b3b':
  Support custom sdk.atree files.
This commit is contained in:
Ying Wang
2014-02-12 23:00:18 +00:00
committed by Android Git Automerger
parent 3afdef2ef0 4170e2be8e
commit 53d2ca0713
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/Makefile
View File

@@ -1571,6 +1571,12 @@ sdk_atree_files := \
$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \ $(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \
$(sdk_tools_atree_files) $(sdk_tools_atree_files)
ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ATREE_FILES),)
sdk_atree_files += $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ATREE_FILES)
else
sdk_atree_files += $(atree_dir)/sdk.atree
endif
# development/build/sdk-android-<abi>.atree is used to differentiate # development/build/sdk-android-<abi>.atree is used to differentiate
# between architecture models (e.g. ARMv5TE versus ARMv7) when copying # between architecture models (e.g. ARMv5TE versus ARMv7) when copying
# files like the kernel image. We use TARGET_CPU_ABI because we don't # files like the kernel image. We use TARGET_CPU_ABI because we don't

1
core/product.mk
View File

@@ -86,6 +86,7 @@ _product_var_list := \
PRODUCT_PACKAGE_OVERLAYS \ PRODUCT_PACKAGE_OVERLAYS \
DEVICE_PACKAGE_OVERLAYS \ DEVICE_PACKAGE_OVERLAYS \
PRODUCT_TAGS \ PRODUCT_TAGS \
PRODUCT_SDK_ATREE_FILES \
PRODUCT_SDK_ADDON_NAME \ PRODUCT_SDK_ADDON_NAME \
PRODUCT_SDK_ADDON_COPY_FILES \ PRODUCT_SDK_ADDON_COPY_FILES \
PRODUCT_SDK_ADDON_COPY_MODULES \ PRODUCT_SDK_ADDON_COPY_MODULES \