Commit Graph

33701 Commits

Author SHA1 Message Date
Neha Jain
3307a6c45c Update build tools version to fix b/237299698 am: 0d7a50767b am: a0e7aed535 am: 17dc2742ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20764506

Change-Id: I2b7c49af576bde829e1561c7509663d83cfa1ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 23:19:44 +00:00
Neha Jain
17dc2742ce Update build tools version to fix b/237299698 am: 0d7a50767b am: a0e7aed535
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20764506

Change-Id: I4111dedfa654f79b5ba5f5a37a9dbb4c167bd41d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 22:37:07 +00:00
Neha Jain
a0e7aed535 Update build tools version to fix b/237299698 am: 0d7a50767b
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20764506

Change-Id: Id6ecefa041dfcdd7a1335ec5f7bea0015eacdf0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 22:03:21 +00:00
Yu Liu
4169d8c290 Merge "Explicitly search header files in abi dumper." am: a3871b8183 am: 3db068e5db
Original change: https://android-review.googlesource.com/c/platform/development/+/2359334

Change-Id: I6934039d551e253be781f96bef40ac9864e4c6bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 23:19:51 +00:00
Yu Liu
3db068e5db Merge "Explicitly search header files in abi dumper." am: a3871b8183
Original change: https://android-review.googlesource.com/c/platform/development/+/2359334

Change-Id: Ia375ae3def2ce033e6fee1d90501c6a71e5e3648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 22:43:59 +00:00
Yu Liu
a3871b8183 Merge "Explicitly search header files in abi dumper." 2022-12-16 22:23:27 +00:00
Neha Jain
0d7a50767b Update build tools version to fix b/237299698
Bug: 262711178
Change-Id: Ia275a2ab69ee31b7d81a2ca8c83bef08cbf107df
2022-12-16 21:12:33 +00:00
Yu Liu
0d3029fb87 Explicitly search header files in abi dumper.
Bug: None
Test: Manual
Change-Id: Ie72e0c4490ab9e29152fcdc45e48ca9724e31f7d
2022-12-15 21:48:11 -08:00
Bob Badour
f8061e548f Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: fd964def39 am: bbf1831dc6
Original change: https://android-review.googlesource.com/c/platform/development/+/2357751

Change-Id: I6db1f7cad227334c5a112a55b233ed12736f0192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 01:56:44 +00:00
Bob Badour
bbf1831dc6 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: fd964def39
Original change: https://android-review.googlesource.com/c/platform/development/+/2357751

Change-Id: I9106126a3543659f249e9a429a8f5e5029cc2b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 01:22:09 +00:00
Bob Badour
fd964def39 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" 2022-12-16 00:59:40 +00:00
Bob Badour
0b10b71586 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/OBJViewer/Android.bp
  samples/HeavyWeight/Android.bp
  samples/MySampleRss/Android.bp
  tools/ndk/Android.bp
  tools/ndk/ndkabidump/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I6d275d857a5774e34b7156ecadb66f8c09337a53
2022-12-15 07:19:34 -08:00
Treehugger Robot
d347d5b081 Merge "Revert "Revert "Add tools for updating NDK ABI dumps.""" am: dff4dc6240 am: 4a98147c1d
Original change: https://android-review.googlesource.com/c/platform/development/+/2336135

Change-Id: I321fb517babaa37b40651de2091bdb7077fe1aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 02:00:02 +00:00
Treehugger Robot
4a98147c1d Merge "Revert "Revert "Add tools for updating NDK ABI dumps.""" am: dff4dc6240
Original change: https://android-review.googlesource.com/c/platform/development/+/2336135

Change-Id: I56790789dee3509260e9444536a4e34e24c3f95b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 01:25:47 +00:00
Treehugger Robot
dff4dc6240 Merge "Revert "Revert "Add tools for updating NDK ABI dumps.""" 2022-12-15 01:00:57 +00:00
Hsin-Yi Chen
a11b9c9c9b Merge "Refactor DiffStatus into a class" am: 5eef9c8c1a am: c298718579
Original change: https://android-review.googlesource.com/c/platform/development/+/2337409

Change-Id: I68467ea390281d065969a377b1450aaecfa9fdf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 13:02:38 +00:00
Hsin-Yi Chen
c298718579 Merge "Refactor DiffStatus into a class" am: 5eef9c8c1a
Original change: https://android-review.googlesource.com/c/platform/development/+/2337409

Change-Id: I425fde7ccc1a91ae23540fc64997d77ee3c3351b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 12:29:57 +00:00
Hsin-Yi Chen
5eef9c8c1a Merge "Refactor DiffStatus into a class" 2022-12-14 11:46:01 +00:00
Hsin-Yi Chen
a4c76dbecd Merge "Assert the output file of header-abi-diff" am: 9f8239f8d4 am: 202191db4f
Original change: https://android-review.googlesource.com/c/platform/development/+/2337408

Change-Id: Iebcb25ad2b9956533901d258184faec54e115fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 03:08:07 +00:00
Hsin-Yi Chen
202191db4f Merge "Assert the output file of header-abi-diff" am: 9f8239f8d4
Original change: https://android-review.googlesource.com/c/platform/development/+/2337408

Change-Id: I15feae89241d50e54c7460d3578c9c1f7bace69a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 02:36:40 +00:00
Hsin-Yi Chen
4a0b74b22a Refactor DiffStatus into a class
DiffStatus is a class that exposes constants and member functions.
AbiDiffHelper calls the member functions to determine how to report the
diff. The actual value of a DiffStatus object is encapsulated so that
developers can define new status without changing existing logic.

Test: ./test.py
Bug: 259148872
Change-Id: I2c3be62046aa01d68c84690cb158f8fc7a5b474b
2022-12-14 10:06:13 +08:00
Hsin-Yi Chen
9f8239f8d4 Merge "Assert the output file of header-abi-diff" 2022-12-14 02:05:06 +00:00
Paul Duffin
88a3a2bf9b Always use prebuilt version of core-lambda-stubs in build-tools am: e52040b4a0 am: ff8ff13b53 am: 082182d3de
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20579490

Change-Id: Idbb1023a7e1246c2de54929082d1c8fe18a8fad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 20:31:17 +00:00
Paul Duffin
082182d3de Always use prebuilt version of core-lambda-stubs in build-tools am: e52040b4a0 am: ff8ff13b53
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20579490

Change-Id: I66a5931163d30dd498af7d668e1a925e1830d414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 19:33:07 +00:00
Paul Duffin
ff8ff13b53 Always use prebuilt version of core-lambda-stubs in build-tools am: e52040b4a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20579490

Change-Id: I49fde807e43194cf5a4e4905073d94d64426e9fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 18:23:21 +00:00
Treehugger Robot
bb3b204928 Merge "update_crate_tests.py: update location of bazel binary" am: af6aef5d2b am: 3c49772588
Original change: https://android-review.googlesource.com/c/platform/development/+/2348423

Change-Id: Ie651d3966df2efa8eefa47669802ccb2bc650f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 17:40:03 +00:00
Treehugger Robot
3c49772588 Merge "update_crate_tests.py: update location of bazel binary" am: af6aef5d2b
Original change: https://android-review.googlesource.com/c/platform/development/+/2348423

Change-Id: Id206a1fc8c79e97a8961e85ac27fa7abbe5515d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 17:07:27 +00:00
Treehugger Robot
af6aef5d2b Merge "update_crate_tests.py: update location of bazel binary" 2022-12-13 16:22:35 +00:00
Jeff Vander Stoep
2f3afc25d5 update_crate_tests.py: update location of bazel binary
The binary for bazel moved from tools/bazel to build/bazel/bin/bazel.

Test: run update_crate_tests.py in a Rust crate. Verify results.
Change-Id: I2e586b59876bfd7146cd92efc90055828bf60eac
2022-12-13 15:43:05 +01:00
Hsin-Yi Chen
98d1ee8c04 Assert the output file of header-abi-diff
Test: ./test.py
Bug: 259148872
Change-Id: Ie4270b3fe8c76a63d0b82f246e012d7ca2622fd4
2022-12-13 18:22:34 +08:00
Hsin-Yi Chen
d41f135432 Merge "Do not remove reference dumps before building new dumps" am: 42aa38f51e am: d2f73db168
Original change: https://android-review.googlesource.com/c/platform/development/+/2335206

Change-Id: Ief257dbd9485970440f0ad97c58f79a935db158b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 02:34:26 +00:00
Hsin-Yi Chen
d2f73db168 Merge "Do not remove reference dumps before building new dumps" am: 42aa38f51e
Original change: https://android-review.googlesource.com/c/platform/development/+/2335206

Change-Id: Ie287ead7337ff01a9a65fdba15956d7fcc415a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 02:04:46 +00:00
Hsin-Yi Chen
42aa38f51e Merge "Do not remove reference dumps before building new dumps" 2022-12-12 01:43:17 +00:00
Automerger Merge Worker
0d9fba824f Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 4f52b5713f -s ours
am skip reason: Merged-In I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4 with SHA-1 d97284de03 is already in history

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

Change-Id: I13ee6277e712e2782ff40b5807ad8becea903232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:59:50 +00:00
Xin Li
0c4717235b [automerger skipped] Merge "Merge Android 13 QPR1" am: 6b64fd4b02 -s ours am: 4e3f7fdc45 -s ours
am skip reason: Merged-In I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4 with SHA-1 d97284de03 is already in history

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

Change-Id: I84d79bfe2a9afaab083b2a549da8a74a9133988e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:57:22 +00:00
Xin Li
9715e54dcb [automerger skipped] Merge "Merge Android 13 QPR1" am: 6b64fd4b02 -s ours am: cfb2c63e50 -s ours
am skip reason: Merged-In I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4 with SHA-1 d97284de03 is already in history

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

Change-Id: I33778255cc08aa5452ae6e8a69cddb94b588bcd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:27:14 +00:00
Xin Li
6f2accd497 [automerger skipped] Merge Android 13 QPR1 am: 85f2ac7cae -s ours am: af0ef3435a -s ours
am skip reason: Merged-In I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4 with SHA-1 d97284de03 is already in history

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

Change-Id: I4e6b6de78bbcb988068d5d2af9d7f9cd2642fc65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:24:43 +00:00
Automerger Merge Worker
4f52b5713f Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master
* changes:
  [automerger skipped] Merge "Merge Android 13 QPR1" am: 6b64fd4b02 -s ours
  [automerger skipped] Merge Android 13 QPR1 am: 85f2ac7cae -s ours
2022-12-09 23:29:49 +00:00
Xin Li
4e3f7fdc45 [automerger skipped] Merge "Merge Android 13 QPR1" am: 6b64fd4b02 -s ours
am skip reason: Merged-In I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4 with SHA-1 d97284de03 is already in history

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

Change-Id: Ic60f695562ab24c317079f6974e2769e76939d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:21:52 +00:00
Xin Li
77b8fe0e9a [automerger skipped] Merge Android 13 QPR1 am: 85f2ac7cae -s ours
am skip reason: Merged-In I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4 with SHA-1 d97284de03 is already in history

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

Change-Id: Ic18c46b66b6ee99089fd89b7c927c0cbc250491d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:19:21 +00:00
Xin Li
cfb2c63e50 [automerger skipped] Merge "Merge Android 13 QPR1" am: 6b64fd4b02 -s ours
am skip reason: Merged-In I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4 with SHA-1 d97284de03 is already in history

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

Change-Id: I492912a2d5cf8c507e9b5096af8dfbf15b5a4a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:17:07 +00:00
Xin Li
af0ef3435a [automerger skipped] Merge Android 13 QPR1 am: 85f2ac7cae -s ours
am skip reason: Merged-In I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4 with SHA-1 d97284de03 is already in history

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

Change-Id: I026b44c59e884da141503cca18c39b66fc5bdd37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:14:37 +00:00
Xin Li
6b64fd4b02 Merge "Merge Android 13 QPR1" 2022-12-09 21:51:12 +00:00
Xin Li
85f2ac7cae Merge Android 13 QPR1
Bug: 261731544
Merged-In: I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4
Change-Id: If803f4950c21576bfafaa4d6b63742537450c7e4
2022-12-09 10:23:06 -08:00
Hsin-Yi Chen
231fe7b57a Do not remove reference dumps before building new dumps
Adding or removing the dump files cause soong to regenerate the
ninja files, which takes a few minutes for every product.
create_reference_dumps.py makes "findlsdumps" and the lsdumps paths.
These targets do not trigger ABI diff. Thus it is not necessary to
remove the reference dumps before building new dumps.

Test: ./create_reference_dumps.py
Bug: 255702405
Change-Id: I4f4a43476d7a9c46d41ef237b846547ed41c7c04
2022-12-09 11:47:19 +08:00
Dan Albert
38d34af365 Revert "Revert "Add tools for updating NDK ABI dumps.""
Can't figure out how to get the tests to work when built by soong, so
just removing for now.

This reverts commit d97284de03.

Test: that was the problem
Change-Id: I4bb8c3a81f529fabbc1663b48f93f153db23aa5d
2022-12-08 23:47:14 +00:00
Jeffrey Vander Stoep
a1aa5a3035 Merge "Revert "Add tools for updating NDK ABI dumps."" am: dee56b4eb4 am: 565dec33c0
Original change: https://android-review.googlesource.com/c/platform/development/+/2335563

Change-Id: I43349ac084cb71c3eac63beb8404b3780cb9ce48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 11:23:04 +00:00
Jeffrey Vander Stoep
565dec33c0 Merge "Revert "Add tools for updating NDK ABI dumps."" am: dee56b4eb4
Original change: https://android-review.googlesource.com/c/platform/development/+/2335563

Change-Id: Iec567b23b897e13e1993f2d541bcdc0502da6867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 11:03:24 +00:00
Jeffrey Vander Stoep
dee56b4eb4 Merge "Revert "Add tools for updating NDK ABI dumps."" 2022-12-08 10:31:02 +00:00
Jeffrey Vander Stoep
d97284de03 Revert "Add tools for updating NDK ABI dumps."
This reverts commit 32ebcacc08.

Reason for revert: b/261768629

Bug: 261768629
Change-Id: I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4
2022-12-08 10:14:25 +00:00