LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

Browse Source 
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616

Conflicts:
	build/sdk-android-arm64-v8a.atree
	build/sdk-android-x86.atree
	build/sdk-android-x86_64.atree
	sys-img/images_arm64-v8a_source.prop_template
	sys-img/images_x86_64_source.prop_template
This commit is contained in:
Raphael Moll
2014-06-03 10:44:56 -07:00
committed by Raphael Moll
parent 71ad7c8f4e
commit 3f3f34dc0e
10 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/tools/sdk_repo.mk
View File

@@ -208,9 +208,9 @@ endif
# -----------------------------------------------------------------
# Rules for the SDK Repository XML
SDK_REPO_XML := $(HOST_OUT)/sdk/repository.xml
SDK_EXTRAS_XML := $(HOST_OUT)/sdk/repo-extras.xml
SDK_SYSIMG_XML := $(HOST_OUT)/sdk/repo-sys-img.xml
SDK_REPO_XML := $(MAIN_SDK_DIR)/repository.xml
SDK_EXTRAS_XML := $(MAIN_SDK_DIR)/repo-extras.xml
SDK_SYSIMG_XML := $(MAIN_SDK_DIR)/repo-sys-img.xml
ifneq ($(SDK_REPO_XML_ARGS),)