Commit Graph

33632 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Treehugger Robot
4805e505f0 Merge "Add tools for updating NDK ABI dumps." am: 40301565fe
Original change: https://android-review.googlesource.com/c/platform/development/+/1550381

Change-Id: I2fd43760072c48316397d30178487471d24558bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 20:50:47 +00:00
Treehugger Robot
40301565fe Merge "Add tools for updating NDK ABI dumps." 2022-12-07 20:17:14 +00:00
Dan Albert
32ebcacc08 Add tools for updating NDK ABI dumps.
Builds and copies the current NDK ABI definitions to
prebuilts/abi-dumps/ndk.

Test: mypy ndk
Test: pylint ndk
Test: pytest
Test: ./update_ndk_abi.sh && m ndk
Bug: http://b/156513478
Change-Id: Idf850c7a2a7b02d096943c24989bc12de692af13
2022-12-07 18:10:00 +00:00
Pirama Arumuga Nainar
4c47b7fd89 Merge "Now ignoring adb shell service return error code in acov-llvm.py" am: 1c18adc4e1
Original change: https://android-review.googlesource.com/c/platform/development/+/2328192

Change-Id: I68ab77dcce1349de8dee3c18bdf2b5e020e8252e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 20:15:09 +00:00
Pirama Arumuga Nainar
1c18adc4e1 Merge "Now ignoring adb shell service return error code in acov-llvm.py" 2022-12-06 19:32:37 +00:00
Shaju Mathew
91f544f227 Now ignoring adb shell service return error code in acov-llvm.py
Bug: 261529166

Ignore failures when sending the flush signal.  Some processes may have
exited after we run `adb shell ps` but before we could send the flush signal.

Test: Successful run of coverage metrics using acov-llvm (as documented in go/android-native-coverage-local-workflow

Change-Id: I2fc0f71bf5f6d810b4124e28d7dd69ebfc2579b3
Signed-off-by: Shaju Mathew <shaju@google.com>
2022-12-06 19:31:22 +00:00
Hsin-Yi Chen
2655e5c22d Merge "Remove DiffStatus::opaque_diff" am: 0bfb1a674b
Original change: https://android-review.googlesource.com/c/platform/development/+/2328414

Change-Id: I3a7db9c3dba560914e876d13d6ccb2c6b69bf04f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 08:38:01 +00:00
Hsin-Yi Chen
0bfb1a674b Merge "Remove DiffStatus::opaque_diff" 2022-12-06 07:42:04 +00:00
Hsin-Yi Chen
e14853c82d Remove DiffStatus::opaque_diff
Since the helper function can compare the opaque types' unique IDs, it
is not necessary to return opaque_diff and compare the reference types'
names.

Test: ./test.py
Bug: 255702405
Change-Id: I1264b0f4d0db178a3dc2202a265c5ccb38df7dc2
2022-12-06 10:38:52 +08:00
Treehugger Robot
93e1bd1f1d Merge "Provide a script to update the generated Android.bp" am: 92c1be2a08
Original change: https://android-review.googlesource.com/c/platform/development/+/2319952

Change-Id: I805d7ee33b416b28357be0fbb87aa0508cacd1e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30 05:03:30 +00:00
Treehugger Robot
cef3fe71d4 Merge "multi_update.py update all VNDK snapshots at once." am: 0f52d13b21
Original change: https://android-review.googlesource.com/c/platform/development/+/2318229

Change-Id: Ia5dfc44ecd4badc2ca80a7e91d7c4a4d8209b9cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30 05:02:55 +00:00
Treehugger Robot
92c1be2a08 Merge "Provide a script to update the generated Android.bp" 2022-11-30 04:45:25 +00:00
Justin Yun
c7c0e42748 Provide a script to update the generated Android.bp
modify_bp_for_hwasan.sh updates the generated Android.bp to use
hwasan prebuilt libraries.

Bug: 234772527
Test: modify_bp_for_hwasan.sh Android.bp arch-arm64-armv8/hwasan
      modify_bp_for_hwasan.sh Android.bp restore
Change-Id: I1443200297119d162b680bd8ddd87a9e4ced2e31
2022-11-30 04:44:27 +00:00
Treehugger Robot
0f52d13b21 Merge "multi_update.py update all VNDK snapshots at once." 2022-11-30 04:44:08 +00:00
Justin Yun
9d2e85ec43 multi_update.py update all VNDK snapshots at once.
multi_update.py runs the update.py for all branches at once.
It makes vndk snapshot update much easy.

Bug: 260021945
Test: development/vndk/snapshot/multi_update.py --all -vv
Change-Id: Iaeadf75c8e05f54bcda2c577aba58f483e99ca00
2022-11-30 04:43:03 +00:00
Hsin-Yi Chen
6d443831d9 Merge "Do not create ABI dumps in AOSP directories for vendor libraries" am: 96cfb0519c
Original change: https://android-review.googlesource.com/c/platform/development/+/2319729

Change-Id: Ibb793810862a85a5f9cfdb3b4b59b00054c22fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29 10:48:02 +00:00
Hsin-Yi Chen
96cfb0519c Merge "Do not create ABI dumps in AOSP directories for vendor libraries" 2022-11-29 10:26:12 +00:00
Hsin-Yi Chen
21861cfece Do not create ABI dumps in AOSP directories for vendor libraries
create_reference_dumps.py recognizes VENDOR and PRODUCT tags in
lsdump_paths.txt. The dumps tagged with VENDOR, PRODUCT, VNDK-ext, or
VNDK-SP-ext cannot be created in the AOSP directories in
prebuilts/abi-dumps. The user who wants to generate dumps for vendor
libraries must specify -ref-dump-dir.

Test: ./create_reference_dumps.py -libs libutils
Test: ./create_reference_dumps.py -libs libutils -ref-dump-dir ./test-abi-dumps
Bug: 227282691
Change-Id: Iecf695d23d7a2e5a67859954c905fa9d1481b8ae
2022-11-29 16:20:54 +08:00
Treehugger Robot
b7e01b7581 Merge "Get latest stable version rather than absolute latest." am: cc18ab77b1
Original change: https://android-review.googlesource.com/c/platform/development/+/2309169

Change-Id: I631e2e4ab52d0bdfb6e25c4911d8534cdf99ec53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 17:27:39 +00:00