e8111b789d
Android 14.0.0 release 29 # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWxAAKCRDorT+BmrEO # eJHNAJ9EAMySmKX48nu3f04yk/R+LsvKhgCdFFlGXbkMg0yf+/gpFNhj1zNP3IA= # =q/dZ # -----END PGP SIGNATURE----- # gpg: Signature made Tue Mar 5 01:18:28 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 2399 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 Roshan Pius (11) and others # Via Automerger Merge Worker (232) and others * tag 'android-14.0.0_r29': (23 commits) Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex" Revert^2 "sunfish: Replace NFC app with NFC apex" Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex" Revert^2 "sunfish: Replace NFC app with NFC apex" sunfish: update AIDL IGoogleBattery manifest version to 3 Remove unused Android.mk under device/google/sunfish Revert "sunfish: Replace NFC app with NFC apex" Revert "sunfish(nfc): Modify NFC overlays for NFC apex" Revert "sunfish(nfc): Modify NFC overlays for NFC apex" Revert "sunfish: Replace NFC app with NFC apex" Fix lunch choices for git_main sunfish(nfc): Modify NFC overlays for NFC apex Fix lunch choices for git_main sunfish: Replace NFC app with NFC apex sunfish: Replace NFC app with NFC apex usb: upgrade stats AIDL to v2 Update sunfish SVN to 65 Expect wifi_ext V2-V3 in the framework manifest sunfish: update thermal HAL makefile path device FCM -= android.* ... Conflicts: Android.mk AndroidProducts.mk device.mk device_framework_matrix_product.xml Change-Id: Idc7b28f15b2e80152256dacd038467c2db3be178
25 lines
851 B
Makefile
25 lines
851 B
Makefile
#
|
|
# Copyright 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_sunfish.mk \
|
|
$(LOCAL_DIR)/aosp_sunfish_hwasan.mk \
|
|
$(LOCAL_DIR)/lineage_sunfish.mk
|
|
|
|
COMMON_LUNCH_CHOICES := \
|
|
aosp_sunfish-trunk_staging-userdebug \
|
|
lineage_sunfish-trunk_staging-userdebug
|