commit 4f553c750a2e7a79d36abe82406f2c8eb46310de
author Colin Cross <ccross@android.com> Tue May 22 23:14:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 22 23:14:53 2018 +0000
tree a9e74fb2ff283aca3e814bb9b6f58b780ef73982
parent 33c3d7c1aa80ef788ef9204b1cc0782fc71bf45a
parent 777cf2c450bfa5ff2af4214647d54b095a8f19c4

Merge "Revert "Use AAPT2 by default""

core/force_aapt2.mk

diff --git a/core/force_aapt2.mk b/core/force_aapt2.mk
index 9ca0749..6901116 100644
--- a/core/force_aapt2.mk
+++ b/core/force_aapt2.mk
@@ -17,7 +17,7 @@
 # Including this makefile will force AAPT2 on if FORCE_AAPT2==true,
 # rewriting some properties to convert standard AAPT usage to AAPT2.
 
-ifneq ($(FORCE_AAPT2),false)
+ifeq ($(FORCE_AAPT2),true)
   ifeq ($(LOCAL_USE_AAPT2),)
     # Force AAPT2 on
     LOCAL_USE_AAPT2 := true
@@ -50,6 +50,7 @@
     ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE)))
       ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml))
         # 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
         $(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE))
       endif