From 1cb5ab2dc14fb35359525479a7c7356d84904ce1 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 Merged-In: 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 14333b14c1e07..353c3e0652fb5 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", @@ -137,7 +137,7 @@ cc_library_host_static { proto: { export_proto_headers: true, }, - defaults: ["aapt_defaults"], + defaults: ["aapt2_defaults"], } // ========================================================== @@ -147,7 +147,7 @@ cc_library_host_shared { name: "libaapt2_jni", srcs: toolSources + ["jni/aapt2_jni.cpp"], static_libs: ["libaapt2"], - defaults: ["aapt_defaults"], + defaults: ["aapt2_defaults"], } // ========================================================== @@ -157,7 +157,7 @@ cc_test_host { name: "aapt2_tests", srcs: ["test/Common.cpp", "**/*_test.cpp"], static_libs: ["libaapt2", "libgmock"], - defaults: ["aapt_defaults"], + defaults: ["aapt2_defaults"], } // ========================================================== @@ -167,5 +167,5 @@ cc_binary_host { name: "aapt2", srcs: ["Main.cpp"] + toolSources, static_libs: ["libaapt2"], - defaults: ["aapt_defaults"], + defaults: ["aapt2_defaults"], }