commit 29c90effd20585dd77e7cffa8052ac127eb346c2
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 03 18:42:30 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 03 18:42:30 2022 +0000
tree 1edd5ad4af685e237f8fc31f83083023c940ae82
parent c3270b85fbe65335c693086c3879281af4c36a0b
parent 5169d5c2223b83989b67a564e2935ae57a56d980

Merge changes from topics "data_retry", "setup_data"

* changes:
  Added data retry support
  Added setup/tear down data support

tools/aapt/Android.bp

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