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

Commit 09d831ec authored by Liz Kammer's avatar Liz Kammer
Browse files

Allowlist aapt2 deps. 

Test: bp2build.sh
Change-Id: Ie54a4f3b9e362ce1c5b6ee884318d970b0b10f1c
parent baced71c

android/allowlists/allowlists.go

+13 −3
Original line number Diff line number Diff line
@@ -165,10 +165,12 @@ var ( 
		"frameworks/av/media/liberror":                       Bp2BuildDefaultTrueRecursively,

		"frameworks/av/services/minijail":                    Bp2BuildDefaultTrueRecursively,

		"frameworks/av/media/module/minijail":                Bp2BuildDefaultTrueRecursively,

		"frameworks/base/libs/androidfw":                     Bp2BuildDefaultTrue,

		"frameworks/base/media/tests/MediaDump":              Bp2BuildDefaultTrue,

		"frameworks/base/services/tests/servicestests/aidl":  Bp2BuildDefaultTrue,

		"frameworks/base/startop/apps/test":                  Bp2BuildDefaultTrue,

		"frameworks/base/tests/appwidgets/AppWidgetHostTest": Bp2BuildDefaultTrueRecursively,

		"frameworks/base/tools/aapt2":                        Bp2BuildDefaultTrue,

		"frameworks/native/libs/adbd_auth":                   Bp2BuildDefaultTrueRecursively,

		"frameworks/native/libs/arect":                       Bp2BuildDefaultTrueRecursively,

		"frameworks/native/libs/math":                        Bp2BuildDefaultTrueRecursively,
@@ -261,6 +263,7 @@ var ( 
		"system/core/libvndksupport":                             Bp2BuildDefaultTrueRecursively,

		"system/core/property_service/libpropertyinfoparser":     Bp2BuildDefaultTrueRecursively,

		"system/core/property_service/libpropertyinfoserializer": Bp2BuildDefaultTrueRecursively,

		"system/incremental_delivery/incfs":                      Bp2BuildDefaultTrue,

		"system/libartpalette":                                   Bp2BuildDefaultTrueRecursively,

		"system/libbase":                                         Bp2BuildDefaultTrueRecursively,

		"system/libfmq":                                          Bp2BuildDefaultTrue,
@@ -289,8 +292,8 @@ var ( 
		"system/testing/gtest_extras":                            Bp2BuildDefaultTrueRecursively,

		"system/timezone/apex":                                   Bp2BuildDefaultTrueRecursively,

		"system/timezone/output_data":                            Bp2BuildDefaultTrueRecursively,

		"system/tools/sysprop":                                   Bp2BuildDefaultTrue,

		"system/tools/aidl/build/tests_bp2build":                 Bp2BuildDefaultTrue,

		"system/tools/sysprop":                                   Bp2BuildDefaultTrue,

		"system/unwinding/libunwindstack":                        Bp2BuildDefaultTrueRecursively,



		"tools/apksig": Bp2BuildDefaultTrue,
@@ -337,6 +340,8 @@ var ( 
	}



	Bp2buildModuleAlwaysConvertList = []string{

		"libidmap2_policies",

		"libSurfaceFlingerProp",

		// cc mainline modules

		"code_coverage.policy",

		"code_coverage.policy.other",
@@ -378,7 +383,6 @@ var ( 
		"libgraphicsenv",

		"libhardware",

		"libhardware_headers",

		"libincfs_headers",

		"libnativeloader-headers",

		"libnativewindow_headers",

		"libneuralnetworks_headers",
@@ -561,15 +565,16 @@ var ( 
		"auto_value_plugin_resources",      // TODO(b/210751803), we don't handle path property for filegroups



		// go deps:

		"aapt2-protos",                                                                               // depends on soong_zip, a go binary

		"analyze_bcpf",                                                                               // depends on bpmodify a blueprint_go_binary.

		"apex-protos",                                                                                // depends on soong_zip, a go binary

		"generated_android_icu4j_src_files", "generated_android_icu4j_test_files", "icu4c_test_data", // depends on unconverted modules: soong_zip

		"host_bionic_linker_asm",                                                  // depends on extract_linker, a go binary.

		"host_bionic_linker_script",                                               // depends on extract_linker, a go binary.

		"libc_musl_sysroot_bionic_arch_headers",                                   // depends on soong_zip

		"libc_musl_sysroot_zlib_headers",                                          // depends on soong_zip and zip2zip

		"libc_musl_sysroot_bionic_headers",                                        // 218405924, depends on soong_zip and generates duplicate srcs

		"libc_musl_sysroot_libc++_headers", "libc_musl_sysroot_libc++abi_headers", // depends on soong_zip, zip2zip

		"libc_musl_sysroot_zlib_headers", // depends on soong_zip and zip2zip

		"robolectric-sqlite4java-native", // depends on soong_zip, a go binary

		"robolectric_tzdata",             // depends on soong_zip, a go binary
@@ -626,6 +631,9 @@ var ( 
		// '//bionic/libc:libc_bp2build_cc_library_static' is duplicated in the 'deps' attribute of rule

		"toybox-static",



		// aidl files not created

		"overlayable_policy_aidl_interface",



		// cc_test related.

		// Failing host cc_tests

		"memunreachable_unit_test",
@@ -650,6 +658,8 @@ var ( 
		"libnativebridge6-test-case",

		"libnativebridge6prezygotefork",



		"libandroidfw_tests", "aapt2_tests", // failing due to data path issues



		// cc_test with unconverted deps, or are device-only (and not verified to pass yet)

		"AMRWBEncTest",

		"AmrnbDecoderTest",     // depends on unconverted modules: libaudioutils, libsndfile