Commit Graph

31837 Commits

Author SHA1 Message Date
Treehugger Robot
194afe85d5 Merge "Add license_kinds to VNDK snapshot modules" 2021-11-22 23:49:07 +00:00
Joel Galenson
4f4ac2f8f3 Enable LTO in cargo2android.py.
The latest compiler roll also enabled LTO.  This broke
cargo2android.py, as the test prebuit uses LTO and so cannot be linked
with code built without.  We fix this by enabling it in
cargo2android.py (and ensuring it doesn't add the flag into
Android.bp).

Test: Run
Change-Id: I6c6a813ff58a9e5064752aa59b78247c4af77a26
2021-11-22 15:22:45 -08:00
Isaac Chen
a0914f1db4 Build targets for checking GKI KMI compatibility
Current/latest kernel symbol information files default to:
- kernel/prebuilts/5.4/arm64/Module.symvers (for GKI 5.4)
- kernel/prebuilts/5.10/arm64/vmlinux.symvers (for GKI 5.10)

All kernel symbol information files in this CL are manually copied
from AB of corresponding kernel branches.

The history kernel symbol information files in this CL are
sym-5.*/ directories. The ones without build ID suffix are
symbolic links to the latest ones and can be used for
testing the build test of this CL (see Test below).

After *.symvers diles are released to kernel/prebuilts/5.*/arm64
directories on the Android branch, they will be used as the
current/latest kernel symbol files by default.

3 moudules are created in this CL:
  gki_5_4_kmi_compatibility_test (for arm64 GKI 5.4)
  gki_5_10_kmi_compatibility_test (for arm64 GKI 5.10)
  gki_kmi_compatibility_test (for both arm64 GKI 5.4 & 5.10)

Bug: 206064990
Test: $ m gki_kmi_compatibility_test
Change-Id: I2e966070a392cfd6284676c7598138b5cad4717b
2021-11-22 16:46:02 +08:00
Justin Yun
3e78977d25 Add license_kinds to VNDK snapshot modules
The script reads the license files and list them to the license
module in the generated Android.bp files

Bug: 205641081
Test: run gen_buildfiles.py
Change-Id: I93deb04a5e7da25a2e9476b8fdd6079fc5470211
2021-11-22 16:34:16 +09:00
Xin Li
26376e1083 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 2d66cdd995 -s ours am: 2be3c615e7 -s ours
am skip reason: Merged-In I317342f66ebab949158f9d8480f57eacfa5c786d with SHA-1 647214b144 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16277910

Change-Id: I5379fb98545323264da0194538d22fa12c2debf6
2021-11-18 03:52:42 +00:00
Xin Li
2be3c615e7 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 2d66cdd995 -s ours
am skip reason: Merged-In I317342f66ebab949158f9d8480f57eacfa5c786d with SHA-1 647214b144 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16277910

Change-Id: Ie0889cdbb046eca3d0b436adca8a62de104bfc72
2021-11-18 03:37:16 +00:00
Xin Li
2d66cdd995 Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-18 03:03:43 +00:00
Treehugger Robot
7081591f0d Merge "Stop building some clang tools for darwin-x86" am: a9ed128e59 am: f8a1df582a am: d0ecd9ae95
Original change: https://android-review.googlesource.com/c/platform/development/+/1885758

Change-Id: Ib11d54b66472618f6fe7b82be928aae0a6ebbf39
2021-11-17 04:46:59 +00:00
Treehugger Robot
d0ecd9ae95 Merge "Stop building some clang tools for darwin-x86" am: a9ed128e59 am: f8a1df582a
Original change: https://android-review.googlesource.com/c/platform/development/+/1885758

Change-Id: I0e75329132910bae23ef17b8dac0f6df0de9e116
2021-11-17 04:30:13 +00:00
Treehugger Robot
f8a1df582a Merge "Stop building some clang tools for darwin-x86" am: a9ed128e59
Original change: https://android-review.googlesource.com/c/platform/development/+/1885758

Change-Id: I7f05f8d7b7789e709b056ba62ddaf34022c3b54f
2021-11-17 03:59:54 +00:00
Treehugger Robot
a9ed128e59 Merge "Stop building some clang tools for darwin-x86" 2021-11-17 03:45:08 +00:00
Raju Kulkarni
28e49ea93b [DO NOT MERGE] SDK has been finalized for sc-v2-dev. API level is now 32. So remoing rc suffix from Build tools version number. And resetting the SDK to r1 of the API level which is now API 32 am: 84637a4834
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16275978

Change-Id: I9ea7930eb5383ee987fe87872b04c265e85eef98
2021-11-16 20:10:14 +00:00
Raju Kulkarni
84637a4834 [DO NOT MERGE] SDK has been finalized for sc-v2-dev. API level is now 32. So remoing rc suffix from Build tools version number. And resetting the SDK to r1 of the API level which is now API 32
Bug: 202916060

Change-Id: Ia4fc9d87cfc3133d757d35cefcf38d792c114dc6
2021-11-16 18:56:14 +00:00
Howard Chen
2e9ae1b6fa Merge "Avoid to use make directly" am: f43f5d50e6 am: 2352705620 am: 796ccfd128
Original change: https://android-review.googlesource.com/c/platform/development/+/1890317

Change-Id: I8c6da21772fe7bd7f7e0dd1dec14870636958806
2021-11-12 07:26:29 +00:00
Howard Chen
796ccfd128 Merge "Avoid to use make directly" am: f43f5d50e6 am: 2352705620
Original change: https://android-review.googlesource.com/c/platform/development/+/1890317

Change-Id: Icb64b0e63fbe5dcf0d3d2f47ea5666647a3a885b
2021-11-12 07:08:17 +00:00
Howard Chen
2352705620 Merge "Avoid to use make directly" am: f43f5d50e6
Original change: https://android-review.googlesource.com/c/platform/development/+/1890317

Change-Id: I2e114dffae4c10a3e26a662f425171e2e168e643
2021-11-12 06:54:58 +00:00
Howard Chen
f43f5d50e6 Merge "Avoid to use make directly" 2021-11-12 06:36:52 +00:00
Howard Chen
4cd02dc116 Avoid to use make directly
Buildbot does not allow script to call make directly.

Test: ./development/gsi/build_with_kernel/repack_kernels.sh
Bug: 198363484
Change-Id: Ia24cae56af27c6c73327002ebbed2c067c490851
2021-11-12 06:36:17 +00:00
Treehugger Robot
d23aedd1bd Merge "Deprecate prebuilts/misc/linux-x86/lz4/lz4" am: 5a60ab7012 am: 651902f599 am: 653474db06
Original change: https://android-review.googlesource.com/c/platform/development/+/1883429

Change-Id: I033c4bde500729110691103176cccc8ba81fdcfb
2021-11-11 21:44:01 +00:00
Treehugger Robot
653474db06 Merge "Deprecate prebuilts/misc/linux-x86/lz4/lz4" am: 5a60ab7012 am: 651902f599
Original change: https://android-review.googlesource.com/c/platform/development/+/1883429

Change-Id: Id009dc562cd57f55daf340066110b96532f66880
2021-11-11 21:29:05 +00:00
Treehugger Robot
651902f599 Merge "Deprecate prebuilts/misc/linux-x86/lz4/lz4" am: 5a60ab7012
Original change: https://android-review.googlesource.com/c/platform/development/+/1883429

Change-Id: Idda4604f0abd05372708ec02cae46b0fbb8031ba
2021-11-11 21:12:55 +00:00
Treehugger Robot
5a60ab7012 Merge "Deprecate prebuilts/misc/linux-x86/lz4/lz4" 2021-11-11 20:51:25 +00:00
Xin Li
8ec2dc2746 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I317342f66ebab949158f9d8480f57eacfa5c786d
Change-Id: I618a1982de47f98ec852ca1158b713f30805685e
2021-11-10 08:05:42 +00:00
Hsin-Yi Chen
5284f9a8a3 Stop building some clang tools for darwin-x86
Test: OUT_DIR=out \
      development/vndk/tools/header-checker/android/build-prebuilts.sh
Change-Id: I767f04f6825e6df054d62d3fa0900bdf7b18db17
2021-11-10 15:43:59 +08:00
Treehugger Robot
ad6b7a1a92 Merge "Add 'license' module to the generated Android.bp of VNDK snapshots" am: 189f4b5005 am: 405a8671f4 am: bdb4270c2e am: 8e7f7321a9
Original change: https://android-review.googlesource.com/c/platform/development/+/1885755

Change-Id: If4087474f06d87f10055c7f0ee64bedf60ebd264
2021-11-10 07:12:48 +00:00
Treehugger Robot
8e7f7321a9 Merge "Add 'license' module to the generated Android.bp of VNDK snapshots" am: 189f4b5005 am: 405a8671f4 am: bdb4270c2e
Original change: https://android-review.googlesource.com/c/platform/development/+/1885755

Change-Id: I6109cf149d3aa8e9a768dc8208af0ac37e072414
2021-11-10 07:00:49 +00:00
Treehugger Robot
bdb4270c2e Merge "Add 'license' module to the generated Android.bp of VNDK snapshots" am: 189f4b5005 am: 405a8671f4
Original change: https://android-review.googlesource.com/c/platform/development/+/1885755

Change-Id: I5072f73b03ec15765d371499bb2f942e9cf5a38c
2021-11-10 06:43:49 +00:00
Treehugger Robot
405a8671f4 Merge "Add 'license' module to the generated Android.bp of VNDK snapshots" am: 189f4b5005
Original change: https://android-review.googlesource.com/c/platform/development/+/1885755

Change-Id: Ib3ae881c3ebf9bbe8394e31d9c5136224cd4eda1
2021-11-10 06:26:43 +00:00
Treehugger Robot
189f4b5005 Merge "Add 'license' module to the generated Android.bp of VNDK snapshots" 2021-11-10 06:09:46 +00:00
Justin Yun
f073b74670 Add 'license' module to the generated Android.bp of VNDK snapshots
VNDK snapshot update must include 'license' module in Android.bp
files. Use the license text files in common/NOTICE_FILES directory.

Bug: 205641081
Test: python3 gen_buildfiles.py 30
Change-Id: Ia0d667664693a00aa29164e94d2a820c6ed77e4e
2021-11-10 13:28:24 +09:00
Isaac Chen
d5d883eb9a Merge "Update arm64 GKI 5.4 kernel test module" am: 95de06df17 am: 599cc97fbe am: d1fdb35c3e am: ef80c695d5
Original change: https://android-review.googlesource.com/c/platform/development/+/1883435

Change-Id: I6b6c5a71b1e60ce74222a63456451139dc0bab77
2021-11-08 19:00:15 +00:00
Isaac Chen
ef80c695d5 Merge "Update arm64 GKI 5.4 kernel test module" am: 95de06df17 am: 599cc97fbe am: d1fdb35c3e
Original change: https://android-review.googlesource.com/c/platform/development/+/1883435

Change-Id: I63eaae7f1e771f4109855a3c3f98029c9815bdf2
2021-11-08 18:41:21 +00:00
Isaac Chen
d1fdb35c3e Merge "Update arm64 GKI 5.4 kernel test module" am: 95de06df17 am: 599cc97fbe
Original change: https://android-review.googlesource.com/c/platform/development/+/1883435

Change-Id: I53817ab1402141811487be3c0d0ecdbad5430410
2021-11-08 18:22:44 +00:00
Isaac Chen
599cc97fbe Merge "Update arm64 GKI 5.4 kernel test module" am: 95de06df17
Original change: https://android-review.googlesource.com/c/platform/development/+/1883435

Change-Id: I3b7e09ba528f6c87cbcb12e1cc9a08c6de09c636
2021-11-08 17:56:55 +00:00
Isaac Chen
95de06df17 Merge "Update arm64 GKI 5.4 kernel test module" 2021-11-08 17:34:11 +00:00
Isaac Chen
690d8e6020 Update arm64 GKI 5.4 kernel test module
2 symbols (get_net_ns and prepare_to_wait_exclusive) not supported
by the arm64 GKI KMI, were accidentally included in the related
kernel test module. This change removes those symbols

Bug: 205515339
Test: On a device booted with the recently released arm64 GKI 5.4:
      $ adb shell uname -a
      Linux localhost 5.4.147-android12-9-00038-g7eb444cc279e-ab7855344 #1 SMP PREEMPT Fri Oct 22 01:45:28 UTC 2021 aarch64
      $ atest kmi_comp_test
      ...
      Running Tests...
      arm64-v8a kmi_comp_test
      -----------------------
      kmi_comp_test (1 Test)
      [1/1] kmi_comp_test#kmi_comp_test: PASSED (136ms)
      Summary
      -------
      arm64-v8a kmi_comp_test: Passed: 1, Failed: 0, Ignored: 0, Assumption Failed: 0,
      All tests passed!
Change-Id: I79808936b389d7eae7b400f8d8d09626baa4d9bc
2021-11-08 16:49:36 +08:00
Isaac Chen
5e40f9eee8 Merge "Create a test for GKI KMI compatibility" am: dfbbfab539 am: 0deaac3ac1 am: b46dda7171 am: 9c99f18621
Original change: https://android-review.googlesource.com/c/platform/development/+/1882028

Change-Id: Icd5fdce2c7cac5cd44d7ff0d746a29cfc2d0104e
2021-11-08 07:28:20 +00:00
Isaac Chen
9c99f18621 Merge "Create a test for GKI KMI compatibility" am: dfbbfab539 am: 0deaac3ac1 am: b46dda7171
Original change: https://android-review.googlesource.com/c/platform/development/+/1882028

Change-Id: I699153a6ff184cb56c621260ecc5338e627f8bab
2021-11-08 07:10:47 +00:00
Isaac Chen
b46dda7171 Merge "Create a test for GKI KMI compatibility" am: dfbbfab539 am: 0deaac3ac1
Original change: https://android-review.googlesource.com/c/platform/development/+/1882028

Change-Id: Icd0b85b71e7f475e07d4be74e17ed2e35f497ce3
2021-11-08 06:53:27 +00:00
Isaac Chen
0deaac3ac1 Merge "Create a test for GKI KMI compatibility" am: dfbbfab539
Original change: https://android-review.googlesource.com/c/platform/development/+/1882028

Change-Id: Ie9400fc3225fbf2763d5343ac09a62a679b34078
2021-11-08 06:34:59 +00:00
Isaac Chen
dfbbfab539 Merge "Create a test for GKI KMI compatibility" 2021-11-08 06:23:31 +00:00
Isaac Chen
1531f41cff Create a test for GKI KMI compatibility
Use the kernel test modules to test GKIs for Android 12
- build 7833008 of Android 12 GKI 5.10	2021-10 release
- build 7855344 of Android 12 GKI 5.4	2021-10 release

Bug: 205495384
Test: Connect any arm64 Android 12 device running GKI 5.4 or 5.10
      $ atest kmi_comp_test
      ...
      Running Tests...
      arm64-v8a kmi_comp_test
      -----------------------
      kmi_comp_test (1 Test)
      [1/1] kmi_comp_test#kmi_comp_test: PASSED (169ms)
      Summary
      -------
      arm64-v8a kmi_comp_test: Passed: 1, Failed: 0, Ignored: 0, Assumption Failed: 0,
      All tests passed!
Change-Id: I7474cecf0ad701080b02ffb5193e4f0fe1d46c02
2021-11-08 12:18:28 +08:00
Howard Chen
ca961096fc Deprecate prebuilts/misc/linux-x86/lz4/lz4
Replace prebuilts/misc/linux-x86/lz4/lz4 with external/lz4.

Test: \
  development/gsi/build_with_kernel/fetch_kernel.sh \
  development/gsi/build_with_kernel/repack_kernels.sh
Bug: 205492988

Change-Id: Ic22e6ea7cc68b45761b963ea3c41fd099ea29bc9
2021-11-08 04:03:38 +00:00
Michael Wright
ee8fd7036c S V2 is now 32 am: aa83a1a8ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16140645

Change-Id: I750e5bd04f62d7882ca1d6eae61f27bfb020b0d7
2021-11-06 16:06:50 +00:00
Michael Wright
aa83a1a8ce S V2 is now 32
Essentially just copied vndk-lib-extra-list-current.txt to
vndk-lib-extra-list-32.txt.

Bug: 204295952
Test: N/A
Change-Id: I76430dd2fef061750cd8d65d3a6c76a173d20bc2
Merged-In: I76430dd2fef061750cd8d65d3a6c76a173d20bc2
2021-11-05 19:38:31 +00:00
Treehugger Robot
638264732d Merge "Change android12-5.10 to android13-5.10" am: b3455f4a2e am: 2e3eb8434a am: dc53430c19 am: 6ec722358f
Original change: https://android-review.googlesource.com/c/platform/development/+/1877079

Change-Id: I4edabcdfbbf1cad1fff3daab6680eac7ebc00d46
2021-11-05 18:57:44 +00:00
Brett Chabot
09322b50fe Merge "Add source prop for ATD image." am: 6ba05b6990 am: 587e80895f am: 8c19c5042d am: d36c4501db
Original change: https://android-review.googlesource.com/c/platform/development/+/1871056

Change-Id: I4f17c05957ab449d52d35a0c9a6e9d4d126af43e
2021-11-05 18:47:07 +00:00
Treehugger Robot
6ec722358f Merge "Change android12-5.10 to android13-5.10" am: b3455f4a2e am: 2e3eb8434a am: dc53430c19
Original change: https://android-review.googlesource.com/c/platform/development/+/1877079

Change-Id: I05f01ac3dbf1ac4b412dbbc3efd49c380d27c124
2021-11-05 05:54:54 +00:00
Brett Chabot
d36c4501db Merge "Add source prop for ATD image." am: 6ba05b6990 am: 587e80895f am: 8c19c5042d
Original change: https://android-review.googlesource.com/c/platform/development/+/1871056

Change-Id: Ia3f253c9ca30e09f1160045320e255ce261cb3e3
2021-11-05 05:45:53 +00:00
Treehugger Robot
dc53430c19 Merge "Change android12-5.10 to android13-5.10" am: b3455f4a2e am: 2e3eb8434a
Original change: https://android-review.googlesource.com/c/platform/development/+/1877079

Change-Id: I11ffa9255bec6633f02442faf3c67bb1eac45288
2021-11-04 06:20:05 +00:00