From d6630f5fa7f9d0d36ac2a2953dc01da7338fa725 Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Wed, 2 Mar 2022 20:22:31 +0000
Subject: [PATCH] enable aapt for unbundled builds

It was available for unbundled builds when the build rules were in mk form and aapt2 is enabled for unbundled, so there's not a strong reason why aapt should be disabled for unbundled build

Change-Id: I6589eafbe8d2e423c9ac925b3614763fa6a511ac
Fixes: 217747798
Test: local compile
---
 tools/aapt/Android.bp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tools/aapt/Android.bp b/tools/aapt/Android.bp
index 01eb4f69f842..cc10db9e1523 100644
--- a/tools/aapt/Android.bp
+++ b/tools/aapt/Android.bp
@@ -61,16 +61,6 @@ cc_defaults {
             enabled: true,
         },
     },
-
-    // This tool is prebuilt if we're doing an app-only build.
-    product_variables: {
-        pdk: {
-            enabled: false,
-        },
-        unbundled_build: {
-            enabled: false,
-        },
-    },
 }
 
 // ==========================================================