Rename aapt_defaults to aapt2_defaults
So that tools/aapt/Android.bp can have aapt_defaults. Test: m aapt2 Change-Id: I32e438efb3516d73b347e67297aa09bee91520b1
This commit is contained in:
@@ -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"],
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user