Merge "Export the sqlite build flag to more products" into main (c3ce9e34) · Commits · e / os / android_build

target/board/BoardConfigMainlineCommon.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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

+2 −2

Original line number	Diff line number	Diff line
		@@ -491,8 +491,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)

0 → 100644

+21 −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.
		#

		# 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 −0

Original line number	Diff line number	Diff line
		@@ -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)