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

Commit 7f71c15c authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes I5a26dfff,I28f093d6 into main 

* changes:
  Disable use_resource_processor for framework-res
  Disable use_resource_processor for aapt2 integration tests
parents 1314dc08 f37fd1a3

core/res/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ genrule { 


android_app {

    name: "framework-res",

    use_resource_processor: false,

    sdk_version: "core_platform",

    certificate: "platform",

tools/aapt2/integration-tests/AutoVersionTest/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ package { 
android_test {

    name: "AaptAutoVersionTest",

    sdk_version: "current",

    use_resource_processor: false,

}

tools/aapt2/integration-tests/BasicTest/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ package { 
android_test {

    name: "AaptBasicTest",

    sdk_version: "current",

    use_resource_processor: false,

}

tools/aapt2/integration-tests/StaticLibTest/App/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ package { 
}



android_test {



    name: "AaptTestStaticLib_App",

    sdk_version: "current",

    use_resource_processor: false,

    srcs: ["src/**/*.java"],

    asset_dirs: [

        "assets",

tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ package { 
android_library {

    name: "AaptTestStaticLib_LibOne",

    sdk_version: "current",

    use_resource_processor: false,

    srcs: ["src/**/*.java"],

    resource_dirs: ["res"],

}