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

Merge "Revert "Use AAPT2 by default""

Browse Source 
am: 4f553c750a

Change-Id: If0d8a896da7ab30d2038acefc0cb5b31b60ea187
This commit is contained in:
Colin Cross
2018-05-22 16:24:44 -07:00
committed by android-build-merger
parent fb1e426c78 4f553c750a
commit 0161ef8f3d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/force_aapt2.mk
View File

@@ -17,7 +17,7 @@
# Including this makefile will force AAPT2 on if FORCE_AAPT2==true, # Including this makefile will force AAPT2 on if FORCE_AAPT2==true,
# rewriting some properties to convert standard AAPT usage to AAPT2. # rewriting some properties to convert standard AAPT usage to AAPT2.
ifneq ($(FORCE_AAPT2),false) ifeq ($(FORCE_AAPT2),true)
ifeq ($(LOCAL_USE_AAPT2),) ifeq ($(LOCAL_USE_AAPT2),)
# Force AAPT2 on # Force AAPT2 on
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
@@ -50,6 +50,7 @@ ifneq ($(FORCE_AAPT2),false)
ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE))) ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE)))
ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml)) ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml))
# work around missing manifests by creating a default one # work around missing manifests by creating a default one
$(call pretty-warning, Missing manifest file)
LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml
$(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE)) $(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE))
endif endif