981ef8c4ce
Android 14.0.0 release 29 # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWwwAKCRDorT+BmrEO # eLjhAJ9DyGnBevAU3rS9qlB/1A39ABcHuwCeLnTLL+q3dVB2ZrvgWHBIEQ6KoyI= # =GwhO # -----END PGP SIGNATURE----- # gpg: Signature made Tue Mar 5 01:18:27 2024 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 2386 signatures in the past # 2 years. Encrypted 4 messages in the past 2 years. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Steve Berbary (16) and others # Via Automerger Merge Worker (554) and others * tag 'android-14.0.0_r29': (61 commits) Update bluejay SVN to 56 gps: Disable Vzw SUPL OTDOA Update bluejay SVN to 55 Branch bootloader prebuilts for 24Q2 release Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex" Revert^2 "bluejay: Replace NFC app with NFC apex" Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex" Revert^2 "bluejay: Replace NFC app with NFC apex" Update bluejay SVN to 54 Remove unused Android.mk under device/google/bluejay gps: Enable Vzw SUPL OTDOA Update ShannonIms CERTIFICATE to PRESIGNED Update ShannonIms CERTIFICATE to PRESIGNED Revert "bluejay: Replace NFC app with NFC apex" Update bluejay SVN to 53 Revert "bluejay(nfc): Modify NFC overlays for NFC apex" Revert "bluejay(nfc): Modify NFC overlays for NFC apex" Revert "bluejay: Replace NFC app with NFC apex" powerhint: game mode tuning powerhint: add game mode tuning nodes ... Conflicts: Android.mk AndroidProducts.mk device-bluejay.mk Change-Id: I38cba34da6d14cf5e187d33a887d55a9e5654e7d
25 lines
847 B
Makefile
25 lines
847 B
Makefile
#
|
|
# Copyright (C) 2019 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.
|
|
#
|
|
|
|
PRODUCT_MAKEFILES := \
|
|
$(LOCAL_DIR)/aosp_bluejay.mk \
|
|
$(LOCAL_DIR)/aosp_bluejay_hwasan.mk \
|
|
$(LOCAL_DIR)/factory_bluejay.mk \
|
|
$(LOCAL_DIR)/lineage_bluejay.mk
|
|
|
|
COMMON_LUNCH_CHOICES := \
|
|
aosp_bluejay-trunk_staging-userdebug
|