From a64ebbdad3d5443db8a9926b3ee679fc17d8b3ba Mon Sep 17 00:00:00 2001 From: Lee Shombert Date: Thu, 21 Mar 2024 16:08:50 -0700 Subject: [PATCH] Export the sqlite build flag to more products sqlite is used in many products, including the Android system, mainline modules, and sdks. The trunk-stable build flag must be exported to all of these targets. Bug: 323176655 Change-Id: I23480610b710c0ec3e49c364c179ea76297fb494 --- target/board/BoardConfigMainlineCommon.mk | 3 +++ target/board/mainline_sdk/BoardConfig.mk | 3 +++ target/product/base_system.mk | 4 ++-- target/product/build_variables.mk | 21 +++++++++++++++++++++ target/product/module_common.mk | 1 + target/product/sdk.mk | 3 +++ 6 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 target/product/build_variables.mk diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk index c3878b8c04..2b17349a2f 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk @@ -2,6 +2,9 @@ # # Common compile-time definitions for mainline images. +# Ensure all trunk-stable flags are available. +include build/make/target/product/build_variables.mk + # The generic product target doesn't have any hardware-specific pieces. TARGET_NO_BOOTLOADER := true TARGET_NO_RECOVERY := true diff --git a/target/board/mainline_sdk/BoardConfig.mk b/target/board/mainline_sdk/BoardConfig.mk index 84f8b2dac6..e4c6a8c971 100644 --- a/target/board/mainline_sdk/BoardConfig.mk +++ b/target/board/mainline_sdk/BoardConfig.mk @@ -13,6 +13,9 @@ # limitations under the License. # +# Ensure all trunk-stable flags are available. +include build/make/target/product/build_variables.mk + TARGET_ARCH_SUITE := mainline_sdk HOST_CROSS_OS := linux_bionic diff --git a/target/product/base_system.mk b/target/product/base_system.mk index cd45e2a97c..f32a7552fe 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -490,8 +490,8 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) -# Use the configured release of sqlite -$(call soong_config_set, libsqlite3, release_package_libsqlite3, $(RELEASE_PACKAGE_LIBSQLITE3)) +# Ensure all trunk-stable flags are available. +$(call inherit-product, $(SRC_TARGET_DIR)/product/build_variables.mk) # Use "image" APEXes always. $(call inherit-product,$(SRC_TARGET_DIR)/product/updatable_apex.mk) diff --git a/target/product/build_variables.mk b/target/product/build_variables.mk new file mode 100644 index 0000000000..5fe5333f45 --- /dev/null +++ b/target/product/build_variables.mk @@ -0,0 +1,21 @@ +# +# 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. +# + +# This file contains the trunk-stable flags that should be exported to all +# Android targets. + +# Use the configured release of sqlite +$(call soong_config_set, libsqlite3, release_package_libsqlite3, $(RELEASE_PACKAGE_LIBSQLITE3)) diff --git a/target/product/module_common.mk b/target/product/module_common.mk index 53b2ca6703..bf146a0d2f 100644 --- a/target/product/module_common.mk +++ b/target/product/module_common.mk @@ -14,6 +14,7 @@ # limitations under the License. # +$(call inherit-product, $(SRC_TARGET_DIR)/product/build_variables.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/default_art_config.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/cfi-common.mk) diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 009a9d4706..04649a2d48 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -17,6 +17,9 @@ # This is a simple product that uses configures the minimum amount # needed to build the SDK (without the emulator). +# Ensure all trunk-stable flags are available. +$(call inherit-product, $(SRC_TARGET_DIR)/product/build_variables.mk) + # In order to build the bootclasspath sources, the bootclasspath needs to # be setup via default_art_config.mk. The sources only really make sense # together with a device (e.g. the emulator). So if the SDK sources change