StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,757 Commits 1 Branch 0 Tags
0d0b75bcf2bc30a7cc7b4831b0cbb4c8dae8fc36
Commit Graph

27328 Commits

Author SHA1 Message Date
Ulyana Trafimovich
235f1507e9 Merge "Revert^6 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-18 12:57:38 +00:00
Paul Scovanner
64b00db8f4 Update Security String to 2021-07-05 
Bug: 188458861
Change-Id: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708
 2021-05-17 21:54:30 +00:00
Ulyana Trafimovich
d1d8c7133c Revert^6 "Enforce <uses-library> check for Android.mk modules." 
This reverts commit 80e99d8851.

Reason for revert: relanding CL after fixing barbet-userdebug build.

Bug: 132357300
Change-Id: I4b8e22847215b349393f01f6c0a90dd03b6073cd
Test: on branch sc-dev: lunch barbet-userdebug && m
 2021-05-17 09:36:52 +00:00
Bowgo Tsai
b9af035ee7 BOARD_PREBUILT_BOOTIMAGE: removes the restriction of non system-as-root 
Starting from Android 10, the system.img layout consists of
$TARGET_SYSTEM_OUT and $TARGET_ROOT_OUT, and is mounted by the
init as root. That is, system.img is always created as if
BOARD_BUILD_SYSTEM_ROOT_IMAGE was set.

  https://source.android.com/devices/bootloader/partitions/system-as-root

The previous concern is that there might be compatibility issues between
the ramdisk contained in boot.img with a newer system.img. But this is
no longer an issue after we always mount the system.img as root.

Bug: 187157581
Test: Tree Hugger
Change-Id: I4537e6ce6fb39b4b86caac82a13716abf515ffd6
Merged-In: I4537e6ce6fb39b4b86caac82a13716abf515ffd6
(cherry picked from commit 640544bd96)
 2021-05-17 14:51:16 +08:00
Ulyana Trafimovich
6eac4c2236 Merge "Revert^5 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-14 17:44:21 +00:00
Ulyana Trafimovich
80e99d8851 Revert^5 "Enforce <uses-library> check for Android.mk modules." 
This reverts commit d6057adc0b.

Reason for revert: broken build git_master/barbet-userdebug @ 7362593

Change-Id: I5549aa949ccbead2c7fa3e933db50b6d74f5990e
 2021-05-14 17:34:09 +00:00
Ulyana Trafimovich
67fac6584e Merge "Revert^4 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-14 16:28:55 +00:00
Ulyana Trafimovich
d6057adc0b Revert^4 "Enforce <uses-library> check for Android.mk modules." 
This reverts commit ad645285a6.

Reason for revert: relanding CL after fixing git_sc-car-dev builds and
  other build failures.

Bug: 132357300
Test: on branch sc-dev: lunch seahawk-userdebug && m
Test: on branch sc-dev: lunch osprey-userdebug && m
Test: on branch sc-dev: lunch factory_pipit-userdebug && m
Test: on sc-dev: lunch cf_x86_phone-userdebug && m droid dist tests
Test: forrest build partner-s-d1-fs-dev-slider/aosp_slider-userdebug:
  https://android-build.googleplex.com/builds/forrest/run/L22600000889121228
Change-Id: I74789903bd91d3bb45c69031fcbaf3556cb29408
 2021-05-14 16:25:34 +00:00
Jaewoong Jung
c3eb4ba8b1 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 am: ff4544ceb4 am: b8781f9670 
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: I303106c1dd2da73789e08be3b6170b09066a74c9
 2021-05-14 15:58:08 +00:00
Jaewoong Jung
b8781f9670 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 am: ff4544ceb4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: I2ee3b84f4edf4af08821c8feece944cc84c62fb1
 2021-05-14 15:18:26 +00:00
Jaewoong Jung
ff4544ceb4 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: Ibb6585eca9474b783762343f0ab9f9302a7becb0
 2021-05-14 14:31:22 +00:00
Jaewoong Jung
3218d79aa7 Merge "Do not alter presigned prebuilt apks for SDK > 29." 2021-05-14 14:07:17 +00:00
Anthony Hugh
b961222c08 Merge "Revert "Revert^2 "Enforce <uses-library> check for Android.mk modules.""" into sc-dev 2021-05-14 04:40:15 +00:00
Treehugger Robot
c79de76e3e Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe am: e9b9f7f0f7 am: 9fda600aa3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507

Change-Id: If5d80fcf192bace7c400bec76e77d55e2ea92af9
 2021-05-14 03:02:57 +00:00
Treehugger Robot
9fda600aa3 Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe am: e9b9f7f0f7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507

Change-Id: Id7de61da766da6e0a6ee39e3ee54d0ca902de25f
 2021-05-14 02:39:04 +00:00
Treehugger Robot
e9b9f7f0f7 Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe 
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507

Change-Id: I35bbe366e804b38aafb37a85f41bc71d0afb17ee
 2021-05-14 01:53:24 +00:00
Anthony Hugh
ad645285a6 Revert "Revert^2 "Enforce <uses-library> check for Android.mk modules."" 
This reverts commit b6d1b48f9f.

Reason for revert: This change is breaking seahawk-userdebug

BUG: 188108611

Change-Id: I15b737e2778d437ecbef6ab9f43345da407f2205
 2021-05-14 01:52:06 +00:00
Treehugger Robot
bf5d6238fe Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" 2021-05-14 01:21:41 +00:00
Jaewoong Jung
b34f64fc7a Do not alter presigned prebuilt apks for SDK > 29. 
Bug: 185811447
Test: Manual
Change-Id: I5ea143331e1bd1885dde4e46b086f4ce811f4981
 2021-05-13 16:16:19 -07:00
Ulyana Trafimovich
aeb62e4cbd Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-13 16:23:31 +00:00
Treehugger Robot
ae6bdc0c74 Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" 2021-05-13 12:31:44 +00:00
Ulyana Trafimovich
b6d1b48f9f Revert^2 "Enforce <uses-library> check for Android.mk modules." 
This reverts commit 4caef2b8c8.

Reason for revert: relanding original CL after fixing r11-userdebug.
Bug: 132357300
Test: forrest build for git_master/r11-userdebug

Change-Id: I62268f331c76f31a80b610754c53543b9b59a1c6
 2021-05-13 11:59:52 +00:00
Ulyana Trafimovich
7ceafdaf34 Revert^2 "Enforce <uses-library> check for Android.mk modules." 
This reverts commit a700ad4651.

Reason for revert: relanding original CL with correct Merged-In tag.

Use "Merged-In" tag from CL ag/14062434 to prevent merging in the
stage-aosp-master branch. That CL is unrelated to the current CL,
but related to <uses-library> checks in general.

Bug: 132357300
Change-Id: I10de5b56c51a0407bf027e0be5ac3b0b307cf100
Test: treehugger
Merged-In: I21712e5197b3cb06e82e476f4c2f7277142034e9
 2021-05-13 09:52:38 +00:00
Jeongik Cha
62519def7b Don't make dexpreopt_tools.zip when dex2oat isn't avilable 
Test: m
Bug: 158843648
Change-Id: Iae90ea60fc73f1a6202499528277fce7c950d9d3
 2021-05-13 13:29:39 +09:00
Treehugger Robot
fdca5d9faa Merge "Target for tools to dexpreopt" am: 26bad544c5 am: ee88da65f5 am: 4beb444294 
Original change: https://android-review.googlesource.com/c/platform/build/+/1688306

Change-Id: I91c8fd16af6707d159b448668082fed25d215531
 2021-05-13 01:27:10 +00:00
Treehugger Robot
4beb444294 Merge "Target for tools to dexpreopt" am: 26bad544c5 am: ee88da65f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1688306

Change-Id: I5fd65c6cb65bda59008caf14c355cd9d4b03f863
 2021-05-13 00:55:18 +00:00
Ulyana Trafimovich
a700ad4651 Revert "Enforce <uses-library> check for Android.mk modules." 
This reverts commit 0b154519b0.

Reason for revert: breaks the builds on stage-aosp-master

Change-Id: I72b45041ea8f1d73a57a2788a79183150c12e547
 2021-05-12 22:20:12 +00:00
Ulyana Trafimovich
4caef2b8c8 Revert "Enforce <uses-library> check for Android.mk modules." 
Bug: 187980797

This reverts commit feeb6bcd1e.

Reason for revert: breaks r11-userdebug build.

Change-Id: Iab296d6fa6e1c1e0d06f37609e06b63b72bfdacc
 2021-05-12 22:16:09 +00:00
Jeongik Cha
2522c36b4c Target for tools to dexpreopt 
Bug: 158843648
Test: m droidcore
Change-Id: I580e2b3285cc524234859998a0e4e072ecaef072
 2021-05-12 23:28:49 +09:00
Ulya Trafimovich
0b154519b0 Enforce <uses-library> check for Android.mk modules. 
Use "Merged-In" tag from CL ag/14063987 to prevent merging in the
rvc-qpr-dev-plus-aosp branch. That CL is unrelated to the current CL,
but related to <uses-library> checks in general.

Bug: 132357300
Test: treehugger
Change-Id: If31a9ed148e4f1195bf916a650d0afafef3d6915
Merged-In: I26f2887357193b0d4bb951fa5bb09384c149b381
(cherry picked from commit feeb6bcd1e)
 2021-05-12 14:19:40 +00:00
Ulya Trafimovich
feeb6bcd1e Enforce <uses-library> check for Android.mk modules. 
Bug: 132357300
Test: treehugger
Change-Id: If31a9ed148e4f1195bf916a650d0afafef3d6915
 2021-05-12 11:49:41 +01:00
Tianjie Xu
216c762826 Merge "Don't set the build id if we need to append the digest" am: a530481db1 am: 834dc90be1 am: 5678ae7b1c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1695406

Change-Id: I7a751270df9a6c02763c228f495c40c046c0115b
 2021-05-09 00:10:02 +00:00
Tianjie Xu
5678ae7b1c Merge "Don't set the build id if we need to append the digest" am: a530481db1 am: 834dc90be1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1695406

Change-Id: I9b8b41c7890ecc8a6c32cc249b0db9fd72be3e7a
 2021-05-08 23:30:17 +00:00
Tianjie Xu
a530481db1 Merge "Don't set the build id if we need to append the digest" 2021-05-08 22:56:56 +00:00
Treehugger Robot
62a73dbed0 Merge "DO NOT MERGE - Merge RQ2A.210505.003." 2021-05-08 21:38:02 +00:00
Treehugger Robot
28e99c4932 Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" am: 5a75afbede am: 593ab41f74 am: 9bafad0c19 
Original change: https://android-review.googlesource.com/c/platform/build/+/1699567

Change-Id: Ia34ad43307ce10e08d025c1c21e33fc8099e3cdf
 2021-05-08 02:45:56 +00:00
Treehugger Robot
9bafad0c19 Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" am: 5a75afbede am: 593ab41f74 
Original change: https://android-review.googlesource.com/c/platform/build/+/1699567

Change-Id: I7eae52cdbf184d1c86bf0d073b37c2f06756076d
 2021-05-08 02:27:10 +00:00
Xin Li
7a2e4a990a DO NOT MERGE - Merge RQ2A.210505.003. 
Bug: 187544653
Merged-In: Ica626a3b19e5b642807234c288428cd7e0f40f98
Change-Id: I3ff9da08d4c59e59a50bc89a6f962b185f8d3942
 2021-05-07 18:51:09 -07:00
Treehugger Robot
5a75afbede Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" 2021-05-08 01:47:39 +00:00
Jeongik Cha
f17cca4813 Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost 
The field is the path on the host side. Rename it to be more specific.

Bug: 158843648
Test: m
Change-Id: Ifa37c5f459440a30d508f37f9913f9e559ae6574
 2021-05-07 20:29:29 +09:00
Inseob Kim
972de1ef9f Merge "Add BOARD_USES_ODMIMAGE to soong config" am: 6fa22ce3fa am: 1373c3ffac am: d39aca4357 
Original change: https://android-review.googlesource.com/c/platform/build/+/1697491

Change-Id: I6200017a49162bccea9f1fd0c27c5f7bdfc83a3d
 2021-05-07 01:03:02 +00:00
Inseob Kim
d39aca4357 Merge "Add BOARD_USES_ODMIMAGE to soong config" am: 6fa22ce3fa am: 1373c3ffac 
Original change: https://android-review.googlesource.com/c/platform/build/+/1697491

Change-Id: I757c7aa5dee1408e2bd8e3d57bc70e55fa8ca0da
 2021-05-07 00:44:10 +00:00
Inseob Kim
6fa22ce3fa Merge "Add BOARD_USES_ODMIMAGE to soong config" 2021-05-06 23:59:18 +00:00
satayev
d22401b36a Merge "Add 'platform:' prefix to unqualified system server jars." am: 9eb1435745 am: 0e7db454da am: 0da313110d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1695660

Change-Id: If4dbc8b1097f45e662f009c6c901391e428b8df0
 2021-05-06 12:24:59 +00:00
satayev
0da313110d Merge "Add 'platform:' prefix to unqualified system server jars." am: 9eb1435745 am: 0e7db454da 
Original change: https://android-review.googlesource.com/c/platform/build/+/1695660

Change-Id: I0cc4cbe52c2414024af816f7bc4d451e591200bf
 2021-05-06 12:09:30 +00:00
satayev
9eb1435745 Merge "Add 'platform:' prefix to unqualified system server jars." 2021-05-06 11:32:39 +00:00
Inseob Kim
c58ff2cde9 Add BOARD_USES_ODMIMAGE to soong config 
Bug: 33691272
Test: m selinux_policy
Change-Id: I20a5b61d8ae830caa8792662a9e9886f3da05af8
 2021-05-06 11:09:13 +00:00
Colin Cross
25814d5ee0 Merge "Fix reference to uncleared variable in dex_preopt_odex_install.mk" am: 05302dade9 am: 48ef312c29 am: fe70e5b756 
Original change: https://android-review.googlesource.com/c/platform/build/+/1697782

Change-Id: I01d6fdf72d8d0d8be01d9976157f4ddef19a76ed
 2021-05-06 04:41:56 +00:00
Colin Cross
fe70e5b756 Merge "Fix reference to uncleared variable in dex_preopt_odex_install.mk" am: 05302dade9 am: 48ef312c29 
Original change: https://android-review.googlesource.com/c/platform/build/+/1697782

Change-Id: Ibee2105bb4f912d2b616da95b2b7da2389a999e3
 2021-05-06 04:16:14 +00:00
Colin Cross
05302dade9 Merge "Fix reference to uncleared variable in dex_preopt_odex_install.mk" 2021-05-06 03:16:20 +00:00