Files
device_google_shusky/AndroidProducts.mk
Michael Bestas b1f71de957 Merge tag 'android-14.0.0_r29' into staging/lineage-21_merge-android-14.0.0_r29
Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWwwAKCRDorT+BmrEO
# eNv0AJ9UnF1XCNrDAq4EDlm2tbL7GCjOLwCfXSsC8m+9R3+NZGayj/DHCy/MUyM=
# =orhy
# -----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 2374 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 (26) and others
# Via Automerger Merge Worker (1350) and others
* tag 'android-14.0.0_r29': (129 commits)
  Update husky SVN to 18
  Update shiba SVN to 18
  Update husky SVN to 17
  Update husky SVN to 16
  Update shiba SVN to 17
  Update shiba SVN to 16
  gps: Disable Vzw SUPL OTDOA
  Update husky SVN to 15
  Update shiba SVN to 15
  Revert "modem: Enable VoLTE with MIF off by default"
  Update husky SVN to 14
  Update shiba SVN to 14
  shusky: change util threshold of LC
  Branch bootloader prebuilts for 24Q2 release
  Update husky SVN to 13
  Update shiba SVN to 13
  Update husky SVN to 12
  Update shiba SVN to 12
  audio: Update Fortemedia tuning
  modem: Enable VoLTE with MIF off by default
  ...

 Conflicts:
	AndroidProducts.mk
	device-husky.mk
	device-shiba.mk
	husky/BoardConfig.mk

Change-Id: I26e61daa90fa73a25672eea23d3b579b49807475
2024-03-10 09:10:26 +02:00

38 lines
1.3 KiB
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_ripcurrent.mk \
$(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \
$(LOCAL_DIR)/factory_ripcurrent.mk \
$(LOCAL_DIR)/aosp_husky.mk \
$(LOCAL_DIR)/aosp_husky_61_pgagnostic.mk \
$(LOCAL_DIR)/aosp_husky_fullmte.mk \
$(LOCAL_DIR)/aosp_husky_pgagnostic.mk \
$(LOCAL_DIR)/factory_husky.mk \
$(LOCAL_DIR)/aosp_shiba.mk \
$(LOCAL_DIR)/aosp_shiba_61_pgagnostic.mk \
$(LOCAL_DIR)/aosp_shiba_fullmte.mk \
$(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \
$(LOCAL_DIR)/factory_shiba.mk \
$(LOCAL_DIR)/lineage_husky.mk \
$(LOCAL_DIR)/lineage_shiba.mk
COMMON_LUNCH_CHOICES := \
aosp_ripcurrent-trunk_staging-userdebug \
aosp_husky-trunk_staging-userdebug \
aosp_shiba-trunk_staging-userdebug