Evolution-X-Tensor/device_google_felix
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1796 commits 1 branch 0 tags 122 MiB
Commit graph

1796 commits

This branch
This branch
All branches
Author SHA1 Message Date
Herbert Xue
be68db3120 Remove unused Android.mk under device/google/felix am: 1890f3cb8b 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

Change-Id: Iad4487b4e81c72a8bb6893446448b10e679186a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-20 03:24:05 +00:00
Herbert Xue
1890f3cb8b Remove unused Android.mk under device/google/felix 
Bug: 311516793
Test: NA
Change-Id: Ic22d3796ae71a86e6ea2a0a732603bb505b84fab
 2023-11-17 11:40:58 +08:00
Roshan Pius
9592292e98 Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

Change-Id: If1f2f8599e26dea854aa515568430001f7a77699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 21:49:01 +00:00
Roshan Pius
20494a566f Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128

Change-Id: If410b9437051e4281818fc444d433234f12707da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 21:48:51 +00:00
Roshan Pius
4bc515224b Merge changes from topic "nfc_apex_revert" into main 
* changes:
  Revert "felix: Replace NFC app with NFC apex"
  Revert "felix(nfc): Modify NFC overlays for NFC apex"
 2023-11-08 21:16:20 +00:00
Roshan Pius
7091f06342 Revert "felix: Replace NFC app with NFC apex" 
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:09c1ce320b7948c069bc48645b90eb55cae2bd3e)
Merged-In: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
Change-Id: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
 2023-11-07 06:11:02 +00:00
Roshan Pius
98699d7fb9 Revert "felix(nfc): Modify NFC overlays for NFC apex" 
Revert submission 2802548-nfc_apex

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:2802548-nfc_apex

Bug: 309117462
Test: Compiles, device boots up
Merged-In: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
Change-Id: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
 2023-11-06 19:45:22 +00:00
Greg Kaiser
e1145ed773 Fix lunch choices for git_main am: eecbe76392 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728

Change-Id: I5272a3c8c148b21b0a6e835d0653367349b3cb9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 23:10:18 +00:00
Greg Kaiser
eecbe76392 Fix lunch choices for git_main 
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2d13c2fd2bbc1164beca59490ca0f1c88c25a256)
Merged-In: I441fde351191dfa28e48a54538249be57310971f
Change-Id: I441fde351191dfa28e48a54538249be57310971f
 2023-10-30 22:00:32 +00:00
Lokesh Kumar Goel
d0e0bcb6a5 Update felix SVN to 29 am: 0c650e810d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176955

Change-Id: I0d1ff11bb8df3420779c97aba049991d2448cc6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 19:03:52 +00:00
Lokesh Kumar Goel
446501afd9 Update felix SVN to 28 am: 8ad0e2cf93 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25176953

Change-Id: Iecdf4d01252fd905bfb2e31b953753d727d2bc0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 19:03:26 +00:00
Roshan Pius
fa6eb11ca3 felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475

Change-Id: Ia605f593c54e5942fa7d9a842dcdd1836614ca3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 14:35:52 +00:00
Roshan Pius
422f737c4b felix(nfc): Modify NFC overlays for NFC apex 
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: I4c02990bf44fb5f8de360572f1b15ae6f70520ff
 2023-10-26 04:06:11 +00:00
Lokesh Kumar Goel
0c650e810d Update felix SVN to 29 
Bug: 302612466
Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508
 2023-10-25 20:29:36 +00:00
Lokesh Kumar Goel
8ad0e2cf93 Update felix SVN to 28 
Bug: 302612466
Change-Id: If52eb638b160fd202e0511f6213fa5c5bce4975e
 2023-10-25 19:47:19 +00:00
Roshan Pius
48ee029a6f Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91 am: cda6224f59 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568

Change-Id: Ide3300b576b6a5d2f12829338ea914f76d18dc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 19:38:17 +00:00
Roshan Pius
cda6224f59 Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568

Change-Id: I85de99093656327267c1fd25539a4c4b227f7104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 19:15:53 +00:00
Roshan Pius
996129be91 Merge "felix: Replace NFC app with NFC apex" into main 2023-10-16 18:31:03 +00:00
Roshan Pius
4e94c7642a felix: Replace NFC app with NFC apex 
Bug: 303286040
Test: Compiles
Merged-In: I9ae8d7630d18075b8620997582761787af1a65b4
Change-Id: I9ae8d7630d18075b8620997582761787af1a65b4
 2023-10-13 18:05:54 +00:00
Cole Faust
337debd3fd Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815 am: 96d360a576 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I315544b444a54358c14d51f5310b1e7405a86cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 18:17:37 +00:00
Cole Faust
96d360a576 Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I614b9bbbaf2fad2a28a6f4f5182fc70b7f0421d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 17:45:51 +00:00
Cole Faust
4e3ea6e815 Use PRODUCT_COPY_FILES to install uwb country files 
Previously, these files were installed with a custom $(shell) command
in an Android.mk file. This doesn't let the build system know that
these files exist, and breaks hermetic partition builds.

Instead, install them with PRODUCT_COPY_FILES, and add a check that
the list is up-to-date.

Bug: 205632228
Test: Presubmits
Change-Id: Id43164ae2a106d6d384cd90b2f4191e53b3d34da
 2023-10-06 15:05:07 -07:00
Xin Li
8a40eef5f4 [automerger skipped] Merge Android 14 am: 1fba35369d -s ours am: 5139499d27 -s ours 
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439 is already in history

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2775094

Change-Id: I2669428832c896012bbf2dcaceb950a69c9402f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 08:59:23 +00:00
Xin Li
5139499d27 [automerger skipped] Merge Android 14 am: 1fba35369d -s ours 
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439 is already in history

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2775094

Change-Id: I81d5e347e4cf057faa89f4158a437b4e089d79b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:52:18 +00:00
Xin Li
1fba35369d Merge Android 14 
Bug: 298295554
Merged-In: Ia42c74a3fab73b984823796b61b0e66f7662ac53
Change-Id: I08cb8a2b2050c04b370de78fd0d422730cc60171
 2023-10-05 15:33:08 -07:00
Xin Li
057645d3b3 [automerger skipped] Merge UP1A.231005.007 am: 08f3aa6503 -s ours 
am skip reason: Merged-In I8bd0f5ef94ca1d5e118a701a4cfff58599537476 with SHA-1 f538f8e771 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24878885

Change-Id: Ief63652d08a62e5a17c4639a02af59a53483d5c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 07:15:38 +00:00
Xin Li
08f3aa6503 Merge UP1A.231005.007 
Bug: 291102124
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I218ff755949e928013808486639b33d81dde763b
 2023-09-27 16:04:17 -07:00
Wilson Sung
f05ee3a530 Set the blew prebuilt apps to PRESIGNED am: db6cb71439 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24843850

Change-Id: I012bdf5492f7b39fcee2bd4141731e2303abcb70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 21:54:20 +00:00
Wilson Sung
db6cb71439 Set the blew prebuilt apps to PRESIGNED 
Keep PixelQualifiedNetworksService platfrom key
Other apps are no need to re-sign

Bug: 290766628
Change-Id: Ia42c74a3fab73b984823796b61b0e66f7662ac53
 2023-09-23 03:37:58 +00:00
Ankur Bakshi
9d89d73d20 Update felix SVN to 27 am: f6c3f2ce0c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I9cc17adb6cea0c3d07df1cf2bebe57afb1a4c08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 18:50:05 +00:00
Ankur Bakshi
d9028f34f0 Update felix SVN to 26 am: c49c6b44d2 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: Id72880a559a34e3116b06dc21a2eabb3054e42e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 18:50:03 +00:00
Ankur Bakshi
f6c3f2ce0c Update felix SVN to 27 
Bug: 298087649
Change-Id: I3466d207247e9a8fc26c785e197b16668d33390c
 2023-09-08 01:35:40 +00:00
Ankur Bakshi
c49c6b44d2 Update felix SVN to 26 
Bug: 298087649
Change-Id: I8241b1c4cb733ba18e7970ec74be837b53371707
 2023-09-07 05:19:20 +00:00
Wilson Sung
0d937f7123 Update UWB CERTIFICATE to PRESIGNED 
Bug: 290766628
Change-Id: Id5ec87873a34a7c27f1b90209385884196efae1d
 2023-09-06 17:26:18 +00:00
Xin Li
32953a9018 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours 
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24624441

Change-Id: I482d9b52ba5b5beb6888719e8609cd75adc73e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:45:20 +00:00
Xin Li
12032b942f Merge UP1A.230905.019 
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I6a61ab7455e00e60b4944f19a6d84bf859c642a9
 2023-08-31 12:12:38 -07:00
Android Build Coastguard Worker
163db5e320 [coastguard skipped] Merge sparse cherrypicks from sparse-10740638-L17800000962853027 into udc-release. 
COASTGUARD_SKIP: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
COASTGUARD_SKIP: I077f038eb8bf515ea39a096ce8c4820e3af09ea3

Change-Id: I803c919e9df77054be6165dffc496c487ca819d2
 2023-08-30 23:17:53 +00:00
Android Build Coastguard Worker
c9a1c8da2d Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436880'] into sparse-10740638-L17800000962853027. 
SPARSE_CHANGE: I8bd0f5ef94ca1d5e118a701a4cfff58599537476

Change-Id: I077f038eb8bf515ea39a096ce8c4820e3af09ea3
 2023-08-30 23:10:21 +00:00
Lokesh Kumar Goel
c76769f812 Update felix SVN to 25 
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f538f8e771f5f8d8866c49dddbf82254d8e39f85)
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
 2023-08-30 23:08:31 +00:00
Android Build Coastguard Worker
a2c53a4e0e [coastguard skipped] Merge sparse cherrypicks from sparse-10739010-L93800000962847818 into udc-release. 
COASTGUARD_SKIP: I9a8dc43afb701b8c06ac5f36484fcf335608d657
COASTGUARD_SKIP: I8bd0f5ef94ca1d5e118a701a4cfff58599537476

Change-Id: I9ad70de4979688117c0873b7b784dedbd62ba92c
 2023-08-30 18:58:21 +00:00
Android Build Coastguard Worker
3734416dce Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436880'] into sparse-10739010-L93800000962847818. 
SPARSE_CHANGE: I8bd0f5ef94ca1d5e118a701a4cfff58599537476

Change-Id: I9a8dc43afb701b8c06ac5f36484fcf335608d657
 2023-08-30 18:50:45 +00:00
Lokesh Kumar Goel
eb6f4a6efd Update felix SVN to 25 
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f538f8e771f5f8d8866c49dddbf82254d8e39f85)
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
 2023-08-30 18:48:39 +00:00
Xin Li
f4b38e7b46 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4 -s ours 
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: Ief104b9a8579ed786718adf55dfad6e0ef4a2f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 00:04:44 +00:00
Xin Li
b7cf79b50d [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours 
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I261bdf7ef23cfabc3ed6a0fe67b2044509d108cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 23:59:25 +00:00
Florian Mayer
9c8f7cff7b Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: Idac8aa35d09e6eeaa92a9125ee39ce2421ca1096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 23:42:54 +00:00
Xin Li
66e687a2a4 Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:12:23 +00:00
Florian Mayer
50889ad4db Add aosp_felix_hwasan am: c2556c4c61 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: I29e672a12cd2cec8bcb880c19f99dbd03fe2aac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 22:11:26 +00:00
Florian Mayer
c2556c4c61 Add aosp_felix_hwasan 
Bug: 297918380
Change-Id: I934dc696c9066bdc337a4279296b91744d0b0382
 2023-08-28 13:11:01 -07:00
Android Build Coastguard Worker
3452e1c46c [coastguard skipped] Merge sparse cherrypicks from sparse-10705648-L70200000962736881 into udc-release. 
COASTGUARD_SKIP: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
COASTGUARD_SKIP: Ibe8f592fbf8506c33b06cc47b0dd8d5489d68633

Change-Id: Idae0eec8299c1b6d47fc444c18e7cf1284353826
 2023-08-23 23:46:15 +00:00
Android Build Coastguard Worker
c5c08f04f3 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436880'] into sparse-10705648-L70200000962736881. 
SPARSE_CHANGE: I8bd0f5ef94ca1d5e118a701a4cfff58599537476

Change-Id: Ibe8f592fbf8506c33b06cc47b0dd8d5489d68633
 2023-08-23 23:40:38 +00:00