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

Commit 78197db6 authored by Trevor Radcliffe's avatar Trevor Radcliffe Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "add media.swcodec to Bazel prod allowlist""" into main... 

Merge "Revert "Revert "add media.swcodec to Bazel prod allowlist""" into main am: ed83eba4 am: f048fe41

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652361



Change-Id: I1c3250535906b680f3c1b3091cf25c1a40dd5ff3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4c88928 f048fe41

android/allowlists/allowlists.go

+9 −11
Original line number Diff line number Diff line
@@ -1602,6 +1602,11 @@ var ( 
		"test_com.android.neuralnetworks",

		"libneuralnetworks",

		"libneuralnetworks_static",

		// M13: media.swcodec launch

		"com.android.media.swcodec",

		"test_com.android.media.swcodec",

		"libstagefright_foundation",

		"libcodec2_hidl@1.0",

	}



	// Staging-mode allowlist. Modules in this list are only built
@@ -1609,13 +1614,7 @@ var ( 
	// which will soon be added to the prod allowlist.

	// It is implicit that all modules in ProdMixedBuildsEnabledList will

	// also be built - do not add them to this list.

	StagingMixedBuildsEnabledList = []string{

		// M13: media.swcodec launch

		"com.android.media.swcodec",

		"test_com.android.media.swcodec",

		"libstagefright_foundation",

		"libcodec2_hidl@1.0",

	}

	StagingMixedBuildsEnabledList = []string{}



	// These should be the libs that are included by the apexes in the ProdMixedBuildsEnabledList

	ProdDclaMixedBuildsEnabledList = []string{
@@ -1623,14 +1622,13 @@ var ( 
		"libc++",

		"libcrypto",

		"libcutils",

	}



	// These should be the libs that are included by the apexes in the StagingMixedBuildsEnabledList

	StagingDclaMixedBuildsEnabledList = []string{

		"libstagefright_flacdec",

		"libutils",

	}



	// These should be the libs that are included by the apexes in the StagingMixedBuildsEnabledList

	StagingDclaMixedBuildsEnabledList = []string{}



	// TODO(b/269342245): Enable the rest of the DCLA libs

	// "libssl",