From 3b834bf34786c5b7eea6bafc97de8321b10709fb Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Wed, 4 Nov 2020 17:11:50 +0000 Subject: [PATCH 1/2] Update apex/allowed_deps.txt Test: build/soong/scripts/update-apex-allowed-deps.sh Change-Id: Iad138bdb439e3ebc7a145dec7875b8bb5756d755 --- apex/allowed_deps.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/apex/allowed_deps.txt b/apex/allowed_deps.txt index e5b91e5d9..8c70a56c2 100644 --- a/apex/allowed_deps.txt +++ b/apex/allowed_deps.txt @@ -235,6 +235,7 @@ libc++demangle(minSdkVersion:apex_inherit) libc_headers(minSdkVersion:apex_inherit) libc_headers_arch(minSdkVersion:apex_inherit) libcap(minSdkVersion:29) +libclang_rt.hwasan-aarch64-android.llndk(minSdkVersion:(no version)) libcodec2(minSdkVersion:29) libcodec2_headers(minSdkVersion:29) libcodec2_hidl@1.0(minSdkVersion:29) From ed667a8345b69e21dd5c13a598f571d6113f0826 Mon Sep 17 00:00:00 2001 From: Artur Satayev Date: Thu, 30 Jul 2020 18:26:28 +0100 Subject: [PATCH 2/2] Add PHONY for apex-allowed-deps check. Bug: 149622332 Test: m apex-allowed-deps-check Change-Id: I5848779b4ad04dd4c95e2667f7f62dd2949ac95e Merged-In: I5848779b4ad04dd4c95e2667f7f62dd2949ac95e (cherry picked from commit 01aa11e833807ef55ab5b2322b6538cb3da2e0a4) --- apex/apex_singleton.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go index 803e0c559..ee9fc8115 100644 --- a/apex/apex_singleton.go +++ b/apex/apex_singleton.go @@ -100,6 +100,8 @@ func (s *apexDepsInfoSingleton) GenerateBuildActions(ctx android.SingletonContex "new_allowed_deps": newAllowedDeps.String(), }, }) + + ctx.Phony("apex-allowed-deps-check", s.allowedApexDepsInfoCheckResult) } func (s *apexDepsInfoSingleton) MakeVars(ctx android.MakeVarsContext) {