From 7301fc8aeb38e8a37fb73d58cef22a18adb349fa Mon Sep 17 00:00:00 2001
From: Yu Liu <yudiliu@google.com>
Date: Tue, 2 May 2023 11:39:10 -0700
Subject: [PATCH] Add the DCLA libs used by swcodec to the staging list

Bug: 269342245
Test: run dcla_apex_comparison_test
Change-Id: I26bcbf6447b9216258c18c42e80f729e5651658a
---
 android/allowlists/allowlists.go   | 7 ++++---
 tests/dcla_apex_comparison_test.sh | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index 9f208689f..58accefc1 100644
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -1595,12 +1595,13 @@ var (
 	}
 
 	// These should be the libs that are included by the apexes in the StagingMixedBuildsEnabledList
-	StagingDclaMixedBuildsEnabledList = []string{}
+	StagingDclaMixedBuildsEnabledList = []string{
+		"libstagefright_flacdec",
+		"libutils",
+	}
 
 	// TODO(b/269342245): Enable the rest of the DCLA libs
 	// "libssl",
-	// "libstagefright_flacdec",
-	// "libutils",
 
 	// The list of module types which are expected to spend lots of build time.
 	// With `--ninja_weight_source=soong`, ninja builds these module types and deps first.
diff --git a/tests/dcla_apex_comparison_test.sh b/tests/dcla_apex_comparison_test.sh
index 667dde0b7..e3c189f1c 100755
--- a/tests/dcla_apex_comparison_test.sh
+++ b/tests/dcla_apex_comparison_test.sh
@@ -55,6 +55,8 @@ DCLA_LIBS=(
   libc++.so
   libcrypto.so
   libcutils.so
+  libstagefright_flacdec.so
+  libutils.so
 )
 
 if [[ -z ${OUT_DIR+x} ]]; then