tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Use AAPT2 by default"

Browse source 
This reverts commit ba7699fb9a.

Reason for revert: Broke boot tests on walleye and taimen

Bug: 80142285
Change-Id: Ida54a0b875147420e6e9c0af41b14af50f6397e3
This commit is contained in:
Jeff Gaston 2018-05-22 18:57:22 +00:00 committed by Colin Cross
parent ba7699fb9a
commit 777cf2c450
1 changed files with 2 additions and 1 deletions
Show stats 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