From 75c29b8bd3631200e87c239e80bd14835fd4e0ab Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 31 Jul 2024 11:00:31 -0700 Subject: [PATCH] Create transitive-res-packages for prebuilt java libraries I4e8ace497d701a9645a62dd5a6ac12e9a6830dcf added support for transitive resource packages from Soong, but missed updating prebuilt java libraries defined in Android.mk files. Add an empty file to fix build errors. Bug: 355468901 Test: manual Flag: EXEMPT bugfix Change-Id: I04ae82bbc13e369f220392af1408d8890034d420 --- core/java_prebuilt_internal.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/java_prebuilt_internal.mk b/core/java_prebuilt_internal.mk index 46393acb12..4b6eea7616 100644 --- a/core/java_prebuilt_internal.mk +++ b/core/java_prebuilt_internal.mk @@ -172,6 +172,12 @@ framework_res_package_export := \ endif endif +# transitive-res-packages is only populated for Soong modules for now, but needs +# to exist so that other Make modules can depend on it. Create an empty file. +my_transitive_res_packages := $(intermediates.COMMON)/transitive-res-packages +$(my_transitive_res_packages): + touch $@ + my_res_package := $(intermediates.COMMON)/package-res.apk # We needed only very few PRIVATE variables and aapt2.mk input variables. Reset the unnecessary ones.