commit 403eb57ae3cf69b879df505639e277bd5f13e1e8
author Neha Pattan <npattan@google.com> Tue Dec 14 02:58:57 2021 +0000
committer Neha Pattan <npattan@google.com> Wed Dec 15 21:57:50 2021 +0000
tree ec41aa16997b8068087a44dc2895eb5cd79de1be
parent 508f81fc7a725532a93d5de19b5a9f9515bf4f29

(2/4) Empty APIs for SupplementalApi module.

Bug: 208708734
Test: mmm -j packages/modules/SupplementalApi
Change-Id: Ia1094ba7f6461a5bc3dcf7ef8bb79b0046bf43ed

Android.bp

diff --git a/Android.bp b/Android.bp
index 3b8ef61..23fd580 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,18 @@
 //
 // READ ME: ########################################################
 
+// TODO(b/21090328): Remove filter after we are ready to.
+soong_config_module_type {
+    name: "java_library_with_nonpublic_deps",
+    module_type: "java_library",
+    config_namespace: "ANDROID",
+    bool_variables: ["include_nonpublic_framework_api"],
+    properties: [
+        "static_libs",
+        "libs",
+    ],
+}
+
 package {
     default_applicable_licenses: ["frameworks_base_license"],
 }
@@ -142,7 +154,7 @@
     ],
 }
 
-java_library {
+java_library_with_nonpublic_deps {
     name: "framework-updatable-stubs-module_libs_api",
     static_libs: [
         "android.net.ipsec.ike.stubs.module_lib",
@@ -161,11 +173,18 @@
         "framework-uwb.stubs.module_lib",
         "framework-wifi.stubs.module_lib",
     ],
+    soong_config_variables: {
+        include_nonpublic_framework_api: {
+            static_libs: [
+                "framework-supplementalapi.stubs.module_lib",
+            ],
+        },
+    },
     sdk_version: "module_current",
     visibility: ["//visibility:private"],
 }
 
-java_library {
+java_library_with_nonpublic_deps {
     name: "framework-all",
     installable: false,
     static_libs: [
@@ -186,6 +205,13 @@
         "framework-wifi.impl",
         "updatable-media",
     ],
+    soong_config_variables: {
+        include_nonpublic_framework_api: {
+            static_libs: [
+                "framework-supplementalapi.stubs.module_lib",
+            ],
+        },
+    },
     apex_available: ["//apex_available:platform"],
     sdk_version: "core_platform",
     visibility: [