Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cb5ab2d authored by Dan Willemsen's avatar Dan Willemsen
Browse files

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
parent 896f0187

tools/aapt2/Android.bp

+5 −5
Original line number Original line Diff line number Diff line
@@ -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"],

}
 
}