StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export the sqlite build flag to more products

Browse Source 
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
This commit is contained in:
Lee Shombert
2024-03-21 16:08:50 -07:00
parent 6d5a509efa
commit a64ebbdad3
6 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/board/BoardConfigMainlineCommon.mk
View File

@@ -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

3
target/board/mainline_sdk/BoardConfig.mk
View File

@@ -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

4
target/product/base_system.mk
View File

@@ -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)

21
target/product/build_variables.mk Normal file
View File

@@ -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))

1
target/product/module_common.mk
View File

@@ -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)

3
target/product/sdk.mk
View File

@@ -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