Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a8fd140 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics "product_runtime_apis", "product_var_hidden_api" into main 

* changes:
  Introduce the product sdk_with_runtime_apis
  Introduce the product variable PRODUCT_EXPORT_RUNTIME_APIS
  Introduce product variable PRODUCT_HIDDEN_API_EXPORTABLE_STUBS
parents 0f689778 727dd6c4

core/product.mk

+4 −0
Original line number Diff line number Diff line
@@ -456,6 +456,10 @@ _product_single_value_vars += PRODUCT_BUILD_FROM_SOURCE_STUB 


_product_list_vars += PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS



_product_single_value_vars += PRODUCT_HIDDEN_API_EXPORTABLE_STUBS



_product_single_value_vars += PRODUCT_EXPORT_RUNTIME_APIS



.KATI_READONLY := _product_single_value_vars _product_list_vars

_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

core/soong_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -400,6 +400,10 @@ $(call end_json_map) 


$(call add_json_bool, BuildFromSourceStub, $(findstring true,$(PRODUCT_BUILD_FROM_SOURCE_STUB) $(BUILD_FROM_SOURCE_STUB)))



$(call add_json_bool, HiddenapiExportableStubs, $(filter true,$(PRODUCT_HIDDEN_API_EXPORTABLE_STUBS)))



$(call add_json_bool, ExportRuntimeApis, $(filter true,$(PRODUCT_EXPORT_RUNTIME_APIS)))



$(call json_end)



$(file >$(SOONG_VARIABLES).tmp,$(json_contents))

target/product/AndroidProducts.mk

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/mainline_system_x86_arm.mk \

    $(LOCAL_DIR)/ndk.mk \

    $(LOCAL_DIR)/sdk.mk \

    $(LOCAL_DIR)/sdk_with_runtime_apis.mk \



endif

target/product/sdk_with_runtime_apis.mk

0 → 100644
+22 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2024 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)



PRODUCT_NAME := sdk_with_runtime_apis



PRODUCT_HIDDEN_API_EXPORTABLE_STUBS := true

PRODUCT_EXPORT_RUNTIME_APIS := true
 
 No newline at end of file