From 7cf2c0cce76bd8bea53c6f12bd0221cd335d3e52 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Mon, 5 Feb 2024 22:45:24 +0000 Subject: [PATCH] Introduce make var ANDROID_PUBLIC_EXPORTABLE_STUBS ANDROID_PUBLIC_STUBS currently has multiple usages in the build, in multiple .mk files. Instead of modifying the current functionality of ANDROID_PUBLIC_STUBS by replacing its value from "android_stubs_current" to "android_stubs_current_exportable", this change introduces ANDROID_PUBLIC_EXPORTABLE_STUBS, which evaluates to "android_stubs_current_exportable" and used only when generating the `full_target` in `development/build/Android.mk`. Test: patch in git_main, lunch aosp_arm-ap31-eng && m sdk dist && inspect android.jar outputs Bug: 323261972 Change-Id: Ic2b03a5a4afdefb459d89f8104916446599eaf31 --- android/sdk_version.go | 1 + 1 file changed, 1 insertion(+) diff --git a/android/sdk_version.go b/android/sdk_version.go index 9355667d1..b2ff960ee 100644 --- a/android/sdk_version.go +++ b/android/sdk_version.go @@ -393,6 +393,7 @@ func init() { // Export the name of the soong modules representing the various Java API surfaces. func javaSdkMakeVars(ctx MakeVarsContext) { ctx.Strict("ANDROID_PUBLIC_STUBS", SdkPublic.DefaultJavaLibraryName()) + ctx.Strict("ANDROID_PUBLIC_EXPORTABLE_STUBS", SdkPublic.DefaultExportableJavaLibraryName()) ctx.Strict("ANDROID_SYSTEM_STUBS", SdkSystem.DefaultJavaLibraryName()) ctx.Strict("ANDROID_TEST_STUBS", SdkTest.DefaultJavaLibraryName()) ctx.Strict("ANDROID_MODULE_LIB_STUBS", SdkModule.DefaultJavaLibraryName())