Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename aapt_defaults to aapt2_defaults

Browse Source 
So that tools/aapt/Android.bp can have aapt_defaults.

Test: m aapt2
Change-Id: I32e438efb3516d73b347e67297aa09bee91520b1
Merged-In: I32e438efb3516d73b347e67297aa09bee91520b1
This commit is contained in:
Dan Willemsen
2017-09-08 22:44:51 -07:00
parent 896f01879b
commit 1cb5ab2dc1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/aapt2/Android.bp
View File

@@ -24,7 +24,7 @@ toolSources = [
] ]
cc_defaults { cc_defaults {
name: "aapt_defaults", name: "aapt2_defaults",
cflags: [ cflags: [
"-Wall", "-Wall",
"-Werror", "-Werror",
@@ -137,7 +137,7 @@ cc_library_host_static {
proto: { proto: {
export_proto_headers: true, export_proto_headers: true,
}, },
defaults: ["aapt_defaults"], defaults: ["aapt2_defaults"],
} }
// ========================================================== // ==========================================================
@@ -147,7 +147,7 @@ cc_library_host_shared {
name: "libaapt2_jni", name: "libaapt2_jni",
srcs: toolSources + ["jni/aapt2_jni.cpp"], srcs: toolSources + ["jni/aapt2_jni.cpp"],
static_libs: ["libaapt2"], static_libs: ["libaapt2"],
defaults: ["aapt_defaults"], defaults: ["aapt2_defaults"],
} }
// ========================================================== // ==========================================================
@@ -157,7 +157,7 @@ cc_test_host {
name: "aapt2_tests", name: "aapt2_tests",
srcs: ["test/Common.cpp", "**/*_test.cpp"], srcs: ["test/Common.cpp", "**/*_test.cpp"],
static_libs: ["libaapt2", "libgmock"], static_libs: ["libaapt2", "libgmock"],
defaults: ["aapt_defaults"], defaults: ["aapt2_defaults"],
} }
// ========================================================== // ==========================================================
@@ -167,5 +167,5 @@ cc_binary_host {
name: "aapt2", name: "aapt2",
srcs: ["Main.cpp"] + toolSources, srcs: ["Main.cpp"] + toolSources,
static_libs: ["libaapt2"], static_libs: ["libaapt2"],
defaults: ["aapt_defaults"], defaults: ["aapt2_defaults"],
} }