From ba7699fb9a33d5e82f4871f5ecfbe67e52bdf35c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 16 May 2018 16:11:37 -0700
Subject: [PATCH] Use AAPT2 by default

Switch to using AAPT2 by default.  Can be disabled globally with
FORCE_AAPT2=false or per-module with LOCAL_USE_AAPT2 := false.

Bug: 79481102
Test: m checkbuild
Change-Id: I35719f708fa3bcc1d54721e62ac9cc8780f7cbbe
---
 core/force_aapt2.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/force_aapt2.mk b/core/force_aapt2.mk
index 690111600..9ca07497b 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.
 
-ifeq ($(FORCE_AAPT2),true)
+ifneq ($(FORCE_AAPT2),false)
   ifeq ($(LOCAL_USE_AAPT2),)
     # Force AAPT2 on
     LOCAL_USE_AAPT2 := true
@@ -50,7 +50,6 @@ ifeq ($(FORCE_AAPT2),true)
     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