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

Commit 3f1ed978 authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge changes I304a1e98,I28f093d6 into main 

* changes:
  Add compile_data to AaptSymlinkTest
  Disable use_resource_processor for aapt2 integration tests
parents 638cd10d f30995fa

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"],

}

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

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

    name: "AaptTestStaticLib_LibTwo",

    sdk_version: "current",

    use_resource_processor: false,

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

    resource_dirs: ["res"],

    libs: ["AaptTestStaticLib_LibOne"],