Commit graph

2314 commits

Author SHA1 Message Date
Treehugger Robot
84a6b3d738 Merge "tangorpro: Pull init.insmod.*.cfg from vendor_dlkm" into main 2024-10-08 22:15:21 +00:00
Brian Norris
075b408020 tangorpro: Pull init.insmod.*.cfg from vendor_dlkm
We've started pushing init.insmod.*.cfg into the kernel prebuilts, and
installing it to /vendor_dlkm/etc, but it may not be available on all
prebuilt variants (e.g., kernel 5.10).

Here, we:
1. conditionally install our common init.*cfg to /vendor_dlkm (only if
   $(TARGET_KERNEL_DIR) doesn't have a copy)
2. point init at /vendor_dlkm/etc

When we've cycled completely off of kernel 5.10, we can drop #1.

Bug: 369686096
Test: build, boot
Flag: EXEMPT refactor
Change-Id: Icb9fd5db204cb482a339eb7d8129dfae2538ee68
2024-10-08 20:11:44 +00:00
Treehugger Robot
69223d3af7 Merge "dumpstate: touch: Init using touch_predump" into main 2024-10-02 08:57:01 +00:00
Liana Kazanova (xWF)
32c2f95b10 Revert "Use mediadrm from private instead of tangorpro"
Revert submission 29489024-pixel_tablet_mediadrm

Reason for revert: DroidMonitor: Potential culprit for http://b/369192150 - Verifying through ABTD before submission. 

Reverted changes: /q/submissionid:29489024-pixel_tablet_mediadrm

Change-Id: I3c1c31b871275bf2b5ceb93120918f749f828cd1
2024-09-23 21:03:33 +00:00
Rock Huang
25046bedc2 Use mediadrm from private instead of tangorpro
* Private mediadrm: ag/29478046, ag/29489024

Bug: 367906184
Bug: 366426322
Flag: EXEMPT castauth enabled
Test: b/367906184#comment5
Change-Id: I8dc459ca757de0efd0e989adf92dcb0f4bf5519d
2024-09-20 20:09:33 +08:00
Rock Huang
70a2a32350 Add SOONG_NAMESPACES for mediaDrm plugin
* Without this CL, the following gs-common ag/29381547 will hit a
  duplicated name issue.

Bug: 364190751
Bug: 229298787
Bug: 366426322
Flag: EXEMPT castauth enabled
Test: ab/P80927970
Change-Id: I6bf2fe4ce933f70179cb83fa597caaf98806ffdc
2024-09-16 16:43:14 +08:00
Xin Li
fe83ab93d4 [automerger skipped] Merge 24Q3 to AOSP main am: f58f7ef409 -s ours am: ffa3824435 -s ours
am skip reason: Merged-In Id1e1267ab774725d18687193c1e168dc543a1e7d with SHA-1 0b1f5e7fc9 is already in history

Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/3257965

Change-Id: If274207a658a0d184a19afb75d0192a7b2a980ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 03:32:12 +00:00
Xin Li
ffa3824435 [automerger skipped] Merge 24Q3 to AOSP main am: f58f7ef409 -s ours
am skip reason: Merged-In Id1e1267ab774725d18687193c1e168dc543a1e7d with SHA-1 0b1f5e7fc9 is already in history

Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/3257965

Change-Id: I947b093387edc157a515ed0f8e44edb630a4cb8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 02:49:26 +00:00
Robin Peng
3dedd0cfa0 Symlink current prebuilt folder to android root
The Android are now based on Trunk Stable world and Pixel prebuilts CLs
also needs to reply with this which controlled by the flag which results:
- the flag value might be different on each branches
- the flag value are mostly different on each release configuration
- for local builds, ENGs' needs to figure out the correct location
  of current prebuilts by checking through entire prebuilt textproto
  files

To alleviate this problem, create an symlink file under android root
indicates current prebuilt path after invoke the android lunch cmd.

Bug: 364831620
Flag: EXEMPT export current prebuilt path
Change-Id: Ieb2d6f517d62bf9a5270fe7ed5fc7643572ea3fe
Signed-off-by: Robin Peng <robinpeng@google.com>
2024-09-06 07:35:42 +00:00
Xin Li
f58f7ef409 Merge 24Q3 to AOSP main
Bug: 357762254
Merged-In: Id1e1267ab774725d18687193c1e168dc543a1e7d
Change-Id: I2e0f086cb2ebcc02314163c6a91c63040bf2adaf
2024-09-05 17:02:39 -07:00
Ankit Goyal
2dba660f5a Delete mapper4 manifest
Bug: 362183626
Flag: EXEMPT manifest update
Test: Boot to home on shiba
Change-Id: Ie43abdb59c2c5a7c07670f187229314c0cf9539f
2024-08-28 22:55:49 -07:00
Peter (YM)
e1715fd574 Merge "thermal: read thermistor temp from sysfs" into main 2024-08-19 04:10:07 +00:00
Peter (YM)
760188730b thermal: read thermistor temp from sysfs
- avoid wrong sensor value reading for thermalHAL

Bug: 327327502
Test: Build to boot to home
Flag: EXEMPT (bug 337358613)
Change-Id: Id3f90b16dcbb1f485915de9877ff2906d99901c6
Signed-off-by: Peter (YM) <peterym@google.com>
2024-08-16 06:27:38 +00:00
Peter (YM)
390be24332 Merge "thermal:remove unused state2power value" into main 2024-08-15 07:19:18 +00:00
Peter (YM)
8c72a7406d thermal:remove unused state2power value
Bug: 355566259
Test: Build test
Flag: EXEMPT NDK
Change-Id: I7575597cf934c18fd31228a4641bef5e80f4e0a2
Signed-off-by: Peter (YM) <peterym@google.com>
2024-08-15 04:14:20 +00:00
Sam Ou
e36c43bcd3 Merge "thermal: Remove bcl related tzones" into main 2024-08-12 12:32:35 +00:00
Cyan_Hsieh
dd5b81d8c6 update OWNERS to include Android.bp am: 258f90a967 am: 545e139c48
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/3214347

Change-Id: I371d2a650926f4f050a077390f5a1f3544c7d806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 11:07:35 +00:00
Cyan_Hsieh
545e139c48 update OWNERS to include Android.bp am: 258f90a967
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/3214347

Change-Id: I6d2f1fc52dcd897a7f5cee6fc56e12d62fc32118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 10:49:03 +00:00
Cyan_Hsieh
258f90a967 update OWNERS to include Android.bp
Flag: EXEMPT only changing OWNERS
Bug: 357036384
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:21fe5059b81ac22b2a22f07606d3a5f019e14e28)
Merged-In: I14accc21c396a63d492736a235a37cc104683128
Change-Id: I14accc21c396a63d492736a235a37cc104683128
2024-08-09 08:34:24 +00:00
samou
89ece9edde thermal: Remove bcl related tzones
Flag: EXEMPT tuning changes
Bug: 349935208
Test: Confirm boot
Change-Id: I7aacd517cdd0543e9e4f2010615059b03bf10695
Signed-off-by: samou <samou@google.com>
2024-08-06 07:28:53 +00:00
Lokesh Kumar Goel
3ff00c0207 tangorpro: Add build_flags based properties for SMR/EMR build
Flag: build.RELEASE_IS_SMR
Flag: build.RELEASE_IS_EMR
Flag: build.RELEASE_BASE_OS_TANGORPRO
Bug: 155105803
Change-Id: If08bf526b8929a47a964486e45220c725b03e506
2024-07-31 16:59:47 +00:00
guibing
df3dc0eda1 Adpf:tangorpro: switch to multitier heuristic boost.
Bug: 344685639
Test: Checked the trace file running on the device.
Flag: NONE powerhal doesn't have a flag yet
Change-Id: I934a7763c480a6cd46e98ba6020c5ac29cb7587c
2024-07-26 23:20:53 +00:00
Jasmine Cha
5b16c748ba audio: support spatial audio on speaker-safe
Flag: EXEMPT bugfix
Bug: 349953895
Test: manual test

Change-Id: I8fea55fc023ce6ee6ca1d5641695d0b6b0d34fda
Signed-off-by: Jasmine Cha <chajasmine@google.com>
2024-07-17 07:33:38 +00:00
Xin Li
14e7fa65de [automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 9c2d57272f -s ours
am skip reason: Merged-In Id1e1267ab774725d18687193c1e168dc543a1e7d with SHA-1 0b1f5e7fc9 is already in history

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

Change-Id: Ia81209f5474a4701f68e7c5311709e60136953b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 21:46:13 +00:00
Xin Li
9c2d57272f Merge 24Q3 (ab/11976889) to aosp-main-future
Bug: 347831320
Merged-In: Id1e1267ab774725d18687193c1e168dc543a1e7d
Change-Id: Id60e845a9c5546f68d70bb05c9fb7d3741fc625b
2024-06-18 14:13:24 -07:00
Xin Li
01778be4df [automerger skipped] Merge Android 14 QPR3 to AOSP main am: 89a0673397 -s ours am: e80edb1f85 -s ours
am skip reason: Merged-In Ie052fcfb128711cdeed0083e52b40c8c53f4f805 with SHA-1 16db441dbe is already in history

Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/3131540

Change-Id: Ib95e5344f1b18cd770a9c0d05127bdc91a9ba6e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 05:55:38 +00:00
Xin Li
e80edb1f85 [automerger skipped] Merge Android 14 QPR3 to AOSP main am: 89a0673397 -s ours
am skip reason: Merged-In Ie052fcfb128711cdeed0083e52b40c8c53f4f805 with SHA-1 16db441dbe is already in history

Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/3131540

Change-Id: Ide683cfac6e58bbd03081bd29049d9311eb9abec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 20:41:58 +00:00
Xin Li
89a0673397 Merge Android 14 QPR3 to AOSP main
Bug: 346855327
Merged-In: Ie052fcfb128711cdeed0083e52b40c8c53f4f805
Change-Id: I51d6f822dd16d050b9d8082d6c1c2f7a61d4249e
2024-06-13 10:49:07 -07:00
Carter Hsu
a9f6474c2b Merge "audio: update libspeechenhancer for 24Q3" into main 2024-06-12 02:27:57 +00:00
Xin Li
4f457fb780 [automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 16db441dbe -s ours
am skip reason: Merged-In I9ce27a764a09b8d878d4d14ed956205000355610 with SHA-1 bcef5e2c3f is already in history

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

Change-Id: I36856d493c04fceb7d4c77247cdabe4a36e5f870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:36:13 +00:00
Roshan Pius
0b1f5e7fc9 tangor: Enable flag to enable/disable persistent cache for country code
This will be useful for devices that don't have cellular.

Bug: 339139695
Change-Id: Id1e1267ab774725d18687193c1e168dc543a1e7d
Test: None
2024-06-06 18:04:36 +00:00
Xin Li
16db441dbe Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: I9ce27a764a09b8d878d4d14ed956205000355610
Change-Id: Ie052fcfb128711cdeed0083e52b40c8c53f4f805
2024-06-05 14:12:12 -07:00
Carter Hsu
fbd0cb8bc3 audio: update libspeechenhancer for 24Q3
This involves the API change for allowing
HAL to control different instances

Bug: 344707694
Test: VoIP call
Change-Id: I6d811b160f107c16201158c99bf1228ccb7d0d49
Signed-off-by: Carter Hsu <carterhsu@google.com>
2024-06-04 11:46:09 +08:00
Cyan_Hsieh
9b01f7e657 Switch makefile owners to MK_OWNERS am: 231936b1b3 am: b65605ead3
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/3107877

Change-Id: I16be342da1b9176ce7d28a94e745020cea5e8076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:00:00 +00:00
Xin Li
95a4541ba2 [automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: c0f2fd69c5 -s ours
am skip reason: Merged-In I861842e416f0bb4b72aafdbcd6075b01b5a17eef with SHA-1 c31068e9a5 is already in history

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

Change-Id: Id8ac913b200afc8a4b3ad1bc785e79efa0fbd36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 19:45:59 +00:00
Cyan_Hsieh
b65605ead3 Switch makefile owners to MK_OWNERS am: 231936b1b3
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/3107877

Change-Id: I78065e3350668512f0a3ba527897f58805a603a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 14:29:15 +00:00
Cyan_Hsieh
231936b1b3 Switch makefile owners to MK_OWNERS
Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:060a2e65f6976227591588b69114c8488f21077b)
Merged-In: Icedf5981c6a9cd5d08ca9591de8960948dbeb1b3
Change-Id: Icedf5981c6a9cd5d08ca9591de8960948dbeb1b3
2024-05-29 10:00:48 +00:00
Treehugger Robot
76bf3cea64 Merge "audio: remove unused device" into main 2024-05-27 03:23:18 +00:00
Sam Ou
8e1ce1268f Merge "thermal: Remove SOFT_OCP related tzones" into main 2024-05-21 12:28:55 +00:00
Hyungwoo Yang
0d6bf9a031 Merge "Add USI stylus input configuration file" into main 2024-05-17 14:53:49 +00:00
Hyungwoo Yang
6602d509b3 Add USI stylus input configuration file
This is to support the Google USI Subsystem.

Bug: 337984471

Change-Id: If2f935239047028ac70cc2451ec8369248659b95
2024-05-17 08:19:39 +00:00
Wei Wang
34d6cdb063 Merge "Adpf:tangorpro: enable heuristic boost." into main 2024-05-17 07:07:39 +00:00
guibing
8c4dea2fa8 Adpf:tangorpro: enable heuristic boost.
Heuristic boost will adjust the ADPF boost profile when the
powerhal detects the power session is very janky, providing more
boost for deadline sensitive threads managered in the session.

Bug: 341111433
Test: adb shell dumpsys android.hardware.power.IPower/default;
      Check the device adpf sessions' traces.
Change-Id: I4f4d79ed9e169fba6de0eea0e5356fef0bf7e388
2024-05-16 20:42:28 +00:00
Cyan Hsieh
c134324a8d Merge "Update bootloader pdk folder and soong config" into main 2024-05-15 14:01:34 +00:00
samou
4a90451745 thermal: Remove SOFT_OCP related tzones
Bug: 337976702
Test: Confirm boot
Change-Id: If2bf94b3d673b7bd5c7a6367b6eb969af38dba72
Signed-off-by: samou <samou@google.com>
2024-05-15 11:53:59 +00:00
Xin Li
c0f2fd69c5 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I861842e416f0bb4b72aafdbcd6075b01b5a17eef
Change-Id: Ica26d9d65a718cbd78a888afd57c3b27480bdd3a
2024-05-06 12:09:16 -07:00
Cyan_Hsieh
1df894ba9a Update bootloader pdk folder and soong config
Bug: 333834221
Change-Id: I9b0a749ffcb996c82eb79a5759c1465f38780704
2024-05-06 16:38:41 +08:00
Qian-Hao Huang
8cb1da499c Load fips140.ko before all other kernel modules
Bug: 337838109
Bug: 331791671
Change-Id: I3928032b7c5d1eb2595722ca165181172b9535d2
Signed-off-by: Qian-Hao Huang <qhhuang@google.com>
2024-05-02 13:13:33 +00:00
Matt Buckley
80b2d761ba Merge "Add POWER_EFFICIENCY uclamp max to adpf config" into main 2024-04-29 19:42:15 +00:00
Carter Hsu
c4b8f8b977 audio: remove unused device
Bug: 337191827
Test: build pass
Change-Id: Iddcd4b9faa7b491974db36f1de79821d37fc2528
Signed-off-by: Carter Hsu <carterhsu@google.com>
2024-04-27 02:00:39 +08:00