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

Commit fa592315 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Rename aapt_defaults to aapt2_defaults am: 7544b9cb am: 6737dc94 

am: 0b4a0272

Change-Id: Idf3f767e2a978a752b68e22114c2371f29eb1ce7
parents b29045ce 0b4a0272

tools/aapt2/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ toolSources = [ 
]



cc_defaults {

    name: "aapt_defaults",

    name: "aapt2_defaults",

    cflags: [

        "-Wall",

        "-Werror",
@@ -149,7 +149,7 @@ cc_library_host_static { 
    proto: {

        export_proto_headers: true,

    },

    defaults: ["aapt_defaults"],

    defaults: ["aapt2_defaults"],

}



// ==========================================================
@@ -159,7 +159,7 @@ cc_library_host_shared { 
    name: "libaapt2_jni",

    srcs: toolSources + ["jni/aapt2_jni.cpp"],

    static_libs: ["libaapt2"],

    defaults: ["aapt_defaults"],

    defaults: ["aapt2_defaults"],

}



// ==========================================================
@@ -176,7 +176,7 @@ cc_test_host { 
        "libaapt2",

        "libgmock",

    ],

    defaults: ["aapt_defaults"],

    defaults: ["aapt2_defaults"],

}



// ==========================================================
@@ -186,5 +186,5 @@ cc_binary_host { 
    name: "aapt2",

    srcs: ["Main.cpp"] + toolSources,

    static_libs: ["libaapt2"],

    defaults: ["aapt_defaults"],

    defaults: ["aapt2_defaults"],

}