Commits · caba1a1f66a458e5ad64ee97edc35b8cb658892e · halogenOS / android_packages_modules_common

Apr 24, 2024

Remove com.android.location.provider in aosp_mainline_modules · caba1a1f

Jeongik Cha authored 10 months ago

Because it is unintentional added.

Bug: 321000103
Test: build
(cherry picked from https://android-review.googlesource.com/q/commit:e4c585dca4c918cb7fb3044dfd043b1746f0bf18)
Merged-In: I419ed482592f0915d027519873c595aa42db79cf
Change-Id: I419ed482592f0915d027519873c595aa42db79cf

caba1a1f

[automerger skipped] Merge "Add .impl libs of sdk_library to allowed_deps.txt"... · 824c9ccb

Treehugger Robot authored 10 months ago

[automerger skipped] Merge "Add .impl libs of sdk_library to allowed_deps.txt" into main am: 319930a6 am: abadf7f2 -s ours

am skip reason: Merged-In I48e02f254129abbe41e07f25684fde2af0949089 with SHA-1 16421742 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3056423



Change-Id: If3ebd6ae1bcee2d177cc5634b8513399489054cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

824c9ccb

Merge "Add .impl libs of sdk_library to allowed_deps.txt" into main am: · abadf7f2

Treehugger Robot authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3056423

Change-Id: I55303548d547f6f38abc44d429f39f431a57699c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

abadf7f2

[automerger skipped] Merge "Add .impl libs of sdk_library to allowed_deps.txt"... · ba5f6f89

Treehugger Robot authored 10 months ago

[automerger skipped] Merge "Add .impl libs of sdk_library to allowed_deps.txt" into main am: 319930a6 am: 4ec60e89 -s ours

am skip reason: Merged-In I48e02f254129abbe41e07f25684fde2af0949089 with SHA-1 16421742 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3056423



Change-Id: Ibeb62bce672b79aac22433dfe2f875fe985e5638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ba5f6f89

Merge "Add .impl libs of sdk_library to allowed_deps.txt" into main am: · 4ec60e89

Treehugger Robot authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3056423

Change-Id: I0fb11f071470833b677664e04c9fd9921da582a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4ec60e89

Merge "Add .impl libs of sdk_library to allowed_deps.txt" into main · 319930a6
Treehugger Robot authored 10 months ago

319930a6
Merge "Add .impl libs of sdk_library to allowed_deps.txt" into main · c0b82e4e
Treehugger Robot authored 10 months ago

c0b82e4e

Add .impl libs of sdk_library to allowed_deps.txt · 72d6b673

Jihoon Kang authored 10 months ago

https://r.android.com/3035972 delegates dexpreopt of the sdk_library to
its implementation library by creating the apex variant of the
implementation library module. Therefore, the apex variants need to be
added to the allowed_deps.txt entries.

No-Allowed-Deps-Check: build changes
Test: m
Bug: 332785297
Merged-In: I48e02f254129abbe41e07f25684fde2af0949089
Change-Id: I48e02f254129abbe41e07f25684fde2af0949089

72d6b673

Add .impl libs of sdk_library to allowed_deps.txt · 16421742

Jihoon Kang authored 10 months ago

https://r.android.com/3035972 delegates dexpreopt of the sdk_library to
its implementation library by creating the apex variant of the
implementation library module. Therefore, the apex variants need to be
added to the allowed_deps.txt entries.

No-Allowed-Deps-Check: build changes
Test: m
Bug: 332785297
Change-Id: I48e02f254129abbe41e07f25684fde2af0949089

16421742

Apr 23, 2024

Merge "Add allowed_deps for CPP codegen in mainline" into main am: am: · 26efdbab

Ted Bauer authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3040593

Change-Id: I1cfa6e8416f4de63041d8dff273209ad32801f03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

26efdbab

Merge "Add allowed_deps for CPP codegen in mainline" into main am: am: · 47bdada1

Ted Bauer authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3040593

Change-Id: If6cb2f9484f25d29dda1e666447afdaefe1719d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

47bdada1

Merge "Add allowed_deps for CPP codegen in mainline" into main am: · e423cae4

Ted Bauer authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3040593

Change-Id: I4d992eedab84e915c188813aed5ae16183e34b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e423cae4

Merge "Add allowed_deps for CPP codegen in mainline" into main am: · 3e5458a8

Ted Bauer authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3040593

Change-Id: Ida7f6e5f223f9a1ccb5d60a0c492f13f9015d047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3e5458a8

Merge "Add allowed_deps for CPP codegen in mainline" into main · e8341a81
Ted Bauer authored 10 months ago

e8341a81

Add allowed_deps for CPP codegen in mainline · f1028f40

Ted Bauer authored 11 months ago

Bug: 328444881
Test: m
Change-Id: I6861838c626a995c70ee43e2037e6dc105b2ff1a
Apex-Size-Increase: 0 until dependencies are used; analysis forthcoming in b/336579781
Previous-Platform-Support: yes
Aosp-First: yes
Test-Info: tests exist for each independent dependency

f1028f40

Apr 22, 2024

Merge changes from topic "am-0482bcc1f52545f6b8f9b36f88f6a227" into main · 1c7f7888

Automerger Merge Worker authored 10 months ago

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Define aosp_mainline_modules" into main am: cb3226c0 -s ours am: 4a1103b2 -s ours
  [automerger skipped] DO NOT MERGE: Define aosp_mainline_modules am: 4b7ec314 -s ours am: 7047d16c -s ours

1c7f7888

[automerger skipped] Merge "DO NOT MERGE: Define aosp_mainline_modules" into... · 3be1c45f

Treehugger Robot authored 10 months ago

[automerger skipped] Merge "DO NOT MERGE: Define aosp_mainline_modules" into main am: cb3226c0 -s ours am: 4a1103b2 -s ours

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109



Change-Id: I46cb439501562a5b7a827f528af7aab8aef411ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3be1c45f

[automerger skipped] DO NOT MERGE: Define aosp_mainline_modules am: ... · a098b901

Jeongik Cha authored 10 months ago

[automerger skipped] DO NOT MERGE: Define aosp_mainline_modules am: 4b7ec314 -s ours am: 7047d16c -s ours

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109



Change-Id: Id6bb52b8eb3cd938e334dc8c912b49d5516b3e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a098b901

[automerger skipped] Merge "DO NOT MERGE: Define aosp_mainline_modules" into... · 24386352

Treehugger Robot authored 10 months ago

[automerger skipped] Merge "DO NOT MERGE: Define aosp_mainline_modules" into main am: cb3226c0 am: 9dc47b00 -s ours

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109



Change-Id: I170d0e9559e4ab5951beaf9f4c9c1f8388f2a488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

24386352

[automerger skipped] DO NOT MERGE: Define aosp_mainline_modules am: ... · a734dd55

Jeongik Cha authored 10 months ago

[automerger skipped] DO NOT MERGE: Define aosp_mainline_modules am: 4b7ec314 am: 8a943103 -s ours

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109



Change-Id: I7414e07ae3ad913b946d55dc075633dfbaa953a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a734dd55

Merge "DO NOT MERGE: Define aosp_mainline_modules" into main am: · 9dc47b00

Treehugger Robot authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109

Change-Id: I9701ab46a375178e13d6f6831eff0d4c0c1fe065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9dc47b00

DO NOT MERGE: Define aosp_mainline_modules am: · 8a943103

Jeongik Cha authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109

Change-Id: I09c296a514381ece83493c0e70e871f05f4c6f3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8a943103

[automerger skipped] Merge "DO NOT MERGE: Define aosp_mainline_modules" into... · 4a1103b2

Treehugger Robot authored 10 months ago

[automerger skipped] Merge "DO NOT MERGE: Define aosp_mainline_modules" into main am: cb3226c0 -s ours

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109



Change-Id: I32230c8ba17a0dd6597dfbf6ba450f758aa77c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4a1103b2

[automerger skipped] DO NOT MERGE: Define aosp_mainline_modules am: -s ours · 7047d16c

Jeongik Cha authored 10 months ago

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109

Change-Id: I404dc1dbeebcb9cc7c7e0000e63da7330ece0f3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7047d16c

Merge "DO NOT MERGE: Define aosp_mainline_modules" into main · cb3226c0
Treehugger Robot authored 10 months ago

cb3226c0

DO NOT MERGE: Define aosp_mainline_modules · 4b7ec314

Jeongik Cha authored 11 months ago

We're trying to build Android system image which is defined in
Android.bp. It's cumbersome to set visibility for every apex module. So
define an aggregated module for mainline modules.

Bug: 321000103
Test: m nothing
Change-Id: I3fb278feaa015ecbe3bb3a38440561533af8ad46
Merged-In: I3fb278feaa015ecbe3bb3a38440561533af8ad46

4b7ec314

Merge "Define aosp_mainline_modules" into main · 8c88d41c
Jeongik Cha authored 10 months ago

8c88d41c

Apr 19, 2024

[automerger skipped] Merge "Add sdk_library modules to allowed_deps.txt" into... · c90997a5

Treehugger Robot authored 10 months ago

[automerger skipped] Merge "Add sdk_library modules to allowed_deps.txt" into main am: 30147393 am: 7a6fd3b8 -s ours

am skip reason: Merged-In I19c529b2fe030664037a4534d8609a04a49014e8 with SHA-1 76de43b3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3048072



Change-Id: Ic4a3506c664f40c8e839d741dd5a6110dce1a667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c90997a5

[automerger skipped] Merge "Add sdk_library modules to allowed_deps.txt" into... · 6185dbfa

Treehugger Robot authored 10 months ago

[automerger skipped] Merge "Add sdk_library modules to allowed_deps.txt" into main am: 30147393 am: 0404fe81 -s ours

am skip reason: Merged-In I19c529b2fe030664037a4534d8609a04a49014e8 with SHA-1 76de43b3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3048072



Change-Id: I13839aacfb5c4268b0aa2ffb99c95c5690d159dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6185dbfa

Merge "Add sdk_library modules to allowed_deps.txt" into main am: · 0404fe81

Treehugger Robot authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3048072

Change-Id: I9c2441842cd3c9a0241accbea442d274240eec92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0404fe81

Merge "Add sdk_library modules to allowed_deps.txt" into main am: · 7a6fd3b8

Treehugger Robot authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3048072

Change-Id: Iaf5e6e961d337a6363f4205a7671e2013ad5ef9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7a6fd3b8

Merge "Add sdk_library modules to allowed_deps.txt" into main · 30147393
Treehugger Robot authored 10 months ago

30147393

Add sdk_library modules to allowed_deps.txt · e11d13de

Jihoon Kang authored 11 months ago

framework-permission-s is currently being depended by the following
modules:
- test_com.android.permission

android.net.ipsec.ike is currently being depended by the following
modules:
- com.android.ipsec
- test_com.android.ipsec

No-Allowed-Deps-Check: Preexisting dependencies
Test: m
Merged-In: I19c529b2fe030664037a4534d8609a04a49014e8
Change-Id: I7f8c5ae7b9ae054652b1463c3e90aa46206e4c01

e11d13de

Apr 18, 2024

Add sdk_library modules to allowed_deps.txt · 76de43b3

Jihoon Kang authored 10 months ago

framework-permission-s is currently being depended by the following
modules:
- com.android.permission
- test_com.android.permission

android.net.ipsec.ike is currently being depended by the following
modules:
- com.android.ipsec
- test_com.android.ipsec

framework-profiling is currently being depended by the following
modules:
- com.android.profiling

No-Allowed-Deps-Check: Preexisting dependencies
Ignore-AOSP-First: Resolving merge conflicts
Test: m
Bug: 332785297
Change-Id: I19c529b2fe030664037a4534d8609a04a49014e8

76de43b3

[automerger skipped] Add kotlinx_serialization_core as allowed am: ... · 62bc8379

Chaohui Wang authored 10 months ago

[automerger skipped] Add kotlinx_serialization_core as allowed am: cebb84de am: eaba9c89 -s ours

am skip reason: Merged-In I03e459b3521b55c8f1cfe94c9fb7618d485c44b5 with SHA-1 96b72f65 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3047613



Change-Id: Ic061429813f8fa25eddba516e754e0b52e6d06b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

62bc8379

[automerger skipped] Add kotlinx_serialization_core as allowed am: ... · e1b60437

Chaohui Wang authored 10 months ago

[automerger skipped] Add kotlinx_serialization_core as allowed am: cebb84de am: e5ffe71a -s ours

am skip reason: Merged-In I03e459b3521b55c8f1cfe94c9fb7618d485c44b5 with SHA-1 96b72f65 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3047613



Change-Id: I2d84b64d768515ab88e85896efacfe3e0b610a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e1b60437

Add kotlinx_serialization_core as allowed am: · e5ffe71a

Chaohui Wang authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3047613

Change-Id: If570daa1d0492114572ceb1e257797e65fa4020a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e5ffe71a

Add kotlinx_serialization_core as allowed am: · eaba9c89

Chaohui Wang authored 10 months ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3047613

Change-Id: I7309b7f183c5d3ccc2803ebcc813a127b2216bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

eaba9c89

Apr 17, 2024

Add kotlinx_serialization_core as allowed · cebb84de

Chaohui Wang authored 11 months ago

Apex-Size-Increase: 37 kb
Previous-Platform-Support: No
Aosp-First: external dependency
Ignore-AOSP-First: Need update AndroidX in main first to avoid conflict
Test-Info: existing presubmit tests

Bug: 322508920
Test: presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:96b72f65d7cf85f6978db2798b05f5bebae31866)
Merged-In: I03e459b3521b55c8f1cfe94c9fb7618d485c44b5
Change-Id: I03e459b3521b55c8f1cfe94c9fb7618d485c44b5

cebb84de

Apr 12, 2024

Add kotlinx_serialization_core as allowed · 96b72f65

Chaohui Wang authored 11 months ago

Apex-Size-Increase: 37 kb
Previous-Platform-Support: No
Aosp-First: external dependency
Ignore-AOSP-First: Need update AndroidX in main first to avoid conflict
Test-Info: existing presubmit tests

Bug: 322508920
Test: presubmit
Change-Id: I03e459b3521b55c8f1cfe94c9fb7618d485c44b5

96b72f65