From 672e45290bbb9a9a7b1bf7864952761663e07475 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Mon, 17 Jun 2024 14:21:49 -0400 Subject: [PATCH] Don't write allowlisted androidx.* libraries to allowed_deps.txt Ignore-AOSP-First: Required for merge conflict resolution Flag: EXEMPT refactor Bug: 333398044 Test: croot && packages/modules/common/build/update-apex-allowed-deps.sh Change-Id: I350ee64bafcd51f69110d880e0de12ae22558fc9 --- apex/apex_singleton.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go index e6ebff2c1..a8d89b11e 100644 --- a/apex/apex_singleton.go +++ b/apex/apex_singleton.go @@ -46,6 +46,9 @@ var ( Command: "cat $out.rsp | xargs cat" + // Only track non-external dependencies, i.e. those that end up in the binary " | grep -v '(external)'" + + // Allowlist androidx deps + " | grep -v '^androidx\\.'" + + " | grep -v '^prebuilt_androidx\\.'" + // Ignore comments in any of the files " | grep -v '^#'" + " | sort -u -f >$out",