From 7544b9cbb9f0843cd306372087f5b6150021eed5 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 8 Sep 2017 22:44:51 -0700 Subject: [PATCH] Rename aapt_defaults to aapt2_defaults So that tools/aapt/Android.bp can have aapt_defaults. Test: m aapt2 Change-Id: I32e438efb3516d73b347e67297aa09bee91520b1 --- tools/aapt2/Android.bp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp index 1dc47f88ab927..c84fb34e43ab1 100644 --- a/tools/aapt2/Android.bp +++ b/tools/aapt2/Android.bp @@ -24,7 +24,7 @@ toolSources = [ ] cc_defaults { - name: "aapt_defaults", + name: "aapt2_defaults", cflags: [ "-Wall", "-Werror", @@ -142,7 +142,7 @@ cc_library_host_static { proto: { export_proto_headers: true, }, - defaults: ["aapt_defaults"], + defaults: ["aapt2_defaults"], } // ========================================================== @@ -152,7 +152,7 @@ cc_library_host_shared { name: "libaapt2_jni", srcs: toolSources + ["jni/aapt2_jni.cpp"], static_libs: ["libaapt2"], - defaults: ["aapt_defaults"], + defaults: ["aapt2_defaults"], } // ========================================================== @@ -168,7 +168,7 @@ cc_test_host { "libaapt2", "libgmock", ], - defaults: ["aapt_defaults"], + defaults: ["aapt2_defaults"], } // ========================================================== @@ -178,5 +178,5 @@ cc_binary_host { name: "aapt2", srcs: ["Main.cpp"] + toolSources, static_libs: ["libaapt2"], - defaults: ["aapt_defaults"], + defaults: ["aapt2_defaults"], }