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

Commit 1894f3ff authored Oct 03, 2023 by Colin Cross Committed by Cole Faust Dec 11, 2023

Disable use_resource_processor for aapt2 integration tests

These tests are testing aapt2 outputs and shouldn't use
ResourceProcessorBusyBox.

Bug: 294256649
Test: m javac-check
Change-Id: I28f093d697448131968ed4c4c32e31b9a8fb3036
Merged-In: I28f093d697448131968ed4c4c32e31b9a8fb3036

parent 82eae714

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,4 +26,5 @@ package {
	android_test {		android_test {
	name: "AaptAutoVersionTest",		name: "AaptAutoVersionTest",
	sdk_version: "current",		sdk_version: "current",
			use_resource_processor: false,
	}		}

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,4 +26,5 @@ package {
	android_test {		android_test {
	name: "AaptBasicTest",		name: "AaptBasicTest",
	sdk_version: "current",		sdk_version: "current",
			use_resource_processor: false,
	}		}

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

+1 −1

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

	android_test {		android_test {

	name: "AaptTestStaticLib_App",		name: "AaptTestStaticLib_App",
	sdk_version: "current",		sdk_version: "current",
			use_resource_processor: false,
	srcs: ["src/*/.java"],		srcs: ["src/*/.java"],
	asset_dirs: [		asset_dirs: [
	"assets",		"assets",

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ package {
	android_library {		android_library {
	name: "AaptTestStaticLib_LibOne",		name: "AaptTestStaticLib_LibOne",
	sdk_version: "current",		sdk_version: "current",
			use_resource_processor: false,
	srcs: ["src/*/.java"],		srcs: ["src/*/.java"],
	resource_dirs: ["res"],		resource_dirs: ["res"],
	}		}

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ package {
	android_library {		android_library {
	name: "AaptTestStaticLib_LibTwo",		name: "AaptTestStaticLib_LibTwo",
	sdk_version: "current",		sdk_version: "current",
			use_resource_processor: false,
	srcs: ["src/*/.java"],		srcs: ["src/*/.java"],
	resource_dirs: ["res"],		resource_dirs: ["res"],
	libs: ["AaptTestStaticLib_LibOne"],		libs: ["AaptTestStaticLib_LibOne"],