7090a24239
Android 14.0.0 release 29 # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWyAAKCRDorT+BmrEO # eHJKAJ4xLmJfdBE9KvPPDwy6JSBvh22bwgCeMfJMBKn3RmUsJnt7N6uCc1nMJcM= # =UvBR # -----END PGP SIGNATURE----- # gpg: Signature made Tue Mar 5 01:18:32 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 2376 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 Ankur Bakshi (13) and others # Via Automerger Merge Worker (1268) and others * tag 'android-14.0.0_r29': (67 commits) Update felix SVN to 42 Update felix SVN to 41 Update felix SVN to 40 gps: Disable Vzw SUPL OTDOA Update felix SVN to 39 Update felix SVN to 38 Branch bootloader prebuilts for 24Q2 release Update felix SVN to 37 Update felix SVN to 36 Revert^2 "felix(nfc): Modify NFC overlays for NFC apex" Revert^2 "felix: Replace NFC app with NFC apex" Add zoom boost in powerhint for F10 Revert^2 "felix(nfc): Modify NFC overlays for NFC apex" Revert^2 "felix: Replace NFC app with NFC apex" Modify folded smartspace postioning on felix Update felix SVN to 35 Update felix SVN to 34 felix: update AIDL IGoogleBattery manifest version to 3 Remove unused Android.mk under device/google/felix Update felix SVN to 33 ... Conflicts: Android.mk AndroidProducts.mk device-felix.mk Change-Id: I4cadba3659c6a065bc825b92c69b522dafe95159
25 lines
837 B
Makefile
25 lines
837 B
Makefile
#
|
|
# Copyright (C) 2021 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_felix.mk \
|
|
$(LOCAL_DIR)/aosp_felix_hwasan.mk \
|
|
$(LOCAL_DIR)/factory_felix.mk \
|
|
$(LOCAL_DIR)/lineage_felix.mk
|
|
|
|
COMMON_LUNCH_CHOICES := \
|
|
aosp_felix-trunk_staging-userdebug
|