Commit Graph

25016 Commits

Author SHA1 Message Date
Logan Chien
38b51a31c8 Merge "repo-pull: Handle project-not-found error" 2018-08-17 03:51:50 +00:00
Treehugger Robot
1dc3d3be29 Merge changes Ic2fd4056,I198fb9b7,I0d61ea11,I59d9b8f7
* changes:
  Retry the command for querying parent artifacts
  Revise comments for when -v, -m options are needed
  Check first if system_dir and device_dir exists
  Print error on missing device target_files archive
2018-08-16 00:43:43 +00:00
Logan Chien
07ab21bc9d Merge "Remove full paths from abi_diff.proto" 2018-08-15 04:00:52 +00:00
Logan Chien
add620d230 Remove full paths from abi_diff.proto
This commit removes the full import path from abi_diff.proto so that
header-abi-dumper can be built separately.

Test: ./tests/test.py
Change-Id: Iec5062dc7ddecfec0f2fdac5993513fd647475ae
2018-08-14 18:26:34 +08:00
Jae Shin
cfc7c1ba90 Retry the command for querying parent artifacts
Currently mixed build targets are flaky, intermittently breaking
with the error message that either the parent artifact directory
does not exist (system_dir, device_dir) or a specific artifact
in the parent artifact directory does not exist.
To help debug this flakiness issue and avoid any race conditions
within the build-chaining infrastructure, allow the retrying of
the command for querying parent artifacts.

Test: build_mixed system_dir device_dir out_dir
Bug: 112250435
Change-Id: Ic2fd4056163c2a32d6057b6c182061c605cd158d
2018-08-14 18:22:57 +09:00
Jae Shin
d5fd24f609 Revise comments for when -v, -m options are needed
Test: build_mixed
Change-Id: I198fb9b7d9916ee7bb3ab5e005a3de1e4d1dd866
2018-08-14 15:14:17 +09:00
Jae Shin
f418b9b9e5 Check first if system_dir and device_dir exists
Change the order of variable checking so it is clear whether
the system_dir or device_dir does not exist or a specific file
in the *_dir does not exist.

Test: build_mixed system_dir device_dir dist_dir
Merged-In: I0d61ea11c3bd22ef12eccbb46b8f665414188307
Change-Id: I0d61ea11c3bd22ef12eccbb46b8f665414188307
(cherry picked from commit 52edf8fb4f)
2018-08-14 15:13:39 +09:00
Paul Trautrim
d2d8ac9509 Print error on missing device target_files archive
Check the newly-created DEVICE_TARGET_FILES_ARCHIVE variable instead of
checking the DEVICE_ARCHIVE variable twice.

Test: run build_mixed with only the *-img-* archive in the device directory
Merged-In: I59d9b8f77cac1dcdeb2c88cdf37bc8dfbd1111ca
Change-Id: I59d9b8f77cac1dcdeb2c88cdf37bc8dfbd1111ca
(cherry picked from commit c1474312b3)
2018-08-14 15:13:00 +09:00
Logan Chien
88368b1306 Merge changes Id2c62a6a,I20b288ea
* changes:
  Fix function pointer test for header-checker.
  header-checker: Cleanup Android.bp
2018-08-14 05:47:47 +00:00
Jayant Chowdhary
728a91471e Fix function pointer test for header-checker.
Test: changing tests/integration/cpp/include/abstract_class.h changes to
      test results. This would not happen earlier, since inadvertently,
      the test used to pick up abi references locally instead of freshly
      creating them.

Change-Id: Id2c62a6a69b151c5c7f504cfd94bc2be8c851c31
2018-08-14 12:21:53 +08:00
Logan Chien
fa90c59d69 header-checker: Cleanup Android.bp
This commit removes wildcards from the `srcs` properties and removes
unnecessary static libraries.

Test: It builds
Change-Id: I20b288eacf571b367195c809ff23dbbe2c1dd32c
2018-08-14 11:44:07 +08:00
Jae Shin
5979d44e98 Merge "Remove ld.config.txt from prebuilts build rule" 2018-08-14 01:48:09 +00:00
Dan Albert
6a87cc9677 Merge "Update zlib headers to 1.2.7." 2018-08-13 19:36:22 +00:00
Christopher Ferris
9a192cd10b Merge "Handle IOExceptions if addr2line fails." 2018-08-10 22:07:23 +00:00
Christopher Ferris
6fc7aefbba Handle IOExceptions if addr2line fails.
Bug: 112357697

Test: Verified that this doesn't cause any issues with a stack.
Test: Faked an exception and verified no crash.
Change-Id: I61982dbd44ac4f52b008bc35bbff2d9687f6ae25
2018-08-10 12:17:51 -07:00
Jae Shin
124ef784fa Remove ld.config.txt from prebuilts build rule
Starting from the P VNDK snapshot, the linker config file will be
built and installed from the source tree at the time the VNDK
snapshot is installed to the system.img (of Q+), rather than
installing the prebuilt from /prebuilts/vndk/v{VER}. The installed
linker config file is used for both system and vendor processes,
thus should be built from the most up-to-date ld.config.txt
template in the source tree of the system partition.

Test: python gen_buildfiles.py 28 -vv
Test: m -j vndk_v28_arm64; check /system/etc/ld.config.28.txt
Bug: 74658756
Merged-In: I86034e6bbbab6a096814389332c26920ef7d40fc
Change-Id: I86034e6bbbab6a096814389332c26920ef7d40fc
(cherry picked from commit e020f7131e)
2018-08-10 12:04:22 +09:00
Treehugger Robot
c8e3f1d45b Merge "Update platform tools version to 28.0.1." 2018-08-09 00:01:32 +00:00
Josh Gao
2801009155 Update platform tools version to 28.0.1.
Test: n/a
Change-Id: Ie974b5d03b5f629657ac3a9e6c98376bc07ee969
2018-08-08 16:04:42 -07:00
Logan Chien
028c2c112b repo-pull: Handle project-not-found error
This commit add an error handler for project-not-found errors, so that
the failure of mapping one project does not stop us from pulling CLs for
other projects.

Test: repo_pull -g [gerrit] [query]
Change-Id: Ied9d400a09c032418cd345dc076948b06058aec4
2018-08-08 17:00:52 +08:00
Xin Li
f0edd38359 Merge "Merge Android Pie into master" 2018-08-07 16:51:28 +00:00
Treehugger Robot
752ffe8a3b Merge "Remove "is_inlined" from header-abi-dumper" 2018-08-07 05:01:38 +00:00
Xin Li
d6242ac7fd Merge Android Pie into master
Bug: 112104996
Change-Id: Idf7d81f369ca80575139101aa88daa6171d8800b
2018-08-06 17:25:15 -07:00
Nan Zhang
b8d122e2b5 Merge "Revert "Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from""" 2018-08-07 00:05:27 +00:00
Mathieu Chartier
9e068aa334 Merge "Fix GetMappingFromOffset"
am: 0d2f6425ed

Change-Id: Ib743d58a691dbbe517f7cb4cf3ce37f7ce70000d
2018-08-03 16:34:36 -07:00
Mathieu Chartier
0d2f6425ed Merge "Fix GetMappingFromOffset" 2018-08-03 23:01:58 +00:00
Mathieu Chartier
e3503620cd Fix GetMappingFromOffset
Fixed backward calculation of mapping offset.

Added logic to page align the data offset for uncompressed shared
objects. This fixes symbolization.

Bug: 111268230
Test: inspect native heap dump for the Camera app
Change-Id: If1af41e7265f017c1a691008309c8a002d5f588e
2018-08-03 13:26:10 -07:00
Yi-yo Chiang
c79ffcedda Remove "is_inlined" from header-abi-dumper
This commit removes "is_inlined" flag from lsdump's VTableComponent,
because the clang library used to walk the ast doesn't report accurate
information about whether a member function is inlined or not.

Also update the testcases.

Bug: 80217511
Test: ./tests/test.py
Change-Id: I0e133b140a4f3debff8030de7d6712590cf98d76
2018-08-03 14:36:35 +08:00
Yi-yo Chiang
9b82bd1bcf Merge "Print undemanglable symbols in vndk-vtable-dumper"
am: fddbb8c61a

Change-Id: I15795e907a98d511fb0d3cbeccd73f34dd9e1f26
2018-08-02 23:26:27 -07:00
Treehugger Robot
fddbb8c61a Merge "Print undemanglable symbols in vndk-vtable-dumper" 2018-08-03 06:18:55 +00:00
Yi-yo Chiang
adfe53f551 Print undemanglable symbols in vndk-vtable-dumper
Instead of skipping the vtable entry, vndk-vtable-dumper now prints
undemanglable vtable entries.
Vtables should always contain C++ symbols (mangled symbols). The only
exceptions are when vtables contain pure virtual or deleted
virtual functions. In that case the vtable may contain C symbols
(unmangled symbols) of __cxa_pure_virtual or __cxa_deleted_virtual.
In that case we just print the undemanglable C symbol as its mangled and
demangled name, though technically its not mangled.

Bug: 111968285
Test: m vndk-vtable-dumper
Test: vndk-vtable-dumper android.frameworks.displayservice@1.0.so
Test: vndk-vtable-dumper android.frameworks.displayservice@1.0.so -mangled
Change-Id: I4d1c99ba23a327fd5709233a38d309180c9cfd43
2018-08-03 06:04:50 +00:00
Yi-yo Chiang
36e8d459d3 Merge "Check machine arch before detecting relocation type"
am: 36efe44516

Change-Id: Ibca32ca680dc5b5e5ccd61c3a0bb974321f02510
2018-08-02 19:02:55 -07:00
Treehugger Robot
36efe44516 Merge "Check machine arch before detecting relocation type" 2018-08-03 01:51:06 +00:00
Nan Zhang
df5ed36770 Revert "Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from""
This reverts commit 18e28bdbee.

Reason for revert:
This is second attempt.
Previous it broke aosp-master/sdk targets because it was submitted before go/oag/715912 was checked-in.

Bug: b/70351683
Test: create a manual run in go/forrest-ui
Change-Id: Ie86d342dceeee5b585d8b490e0c59fb4c0529883
Merged-In: Ia433796a0152bc9efacf656d06efc2a328a756a1
2018-08-02 18:38:30 +00:00
Yi-yo Chiang
0a93212704 Check machine arch before detecting relocation type
This commit makes vndk-vtable-dumper to check ELF file machine arch
(x86/x86_64/arm/arm64) when detecting relocation type, as relocation
type constants such as R_ARM_ABS32, R_386_32 are not gauranteed to be
unique across different machines.

Test: m vndk-vtable-dumper
Test: vndk-vtable-dumper libziparchive.so # with x86/x86_64/arm/arm64 arch
Change-Id: I58d6d7bff7b7eb16e96cbe02f4989e45a17fd295
2018-08-02 17:51:36 +08:00
Yi-yo Chiang
0946ce23fd Merge "create_reference_dumps.py: Change lsdump_paths.txt to newline-separated paths"
am: 77b844cb98

Change-Id: Ie1ac2158c9857df35a139599728d90147937ceae
2018-07-31 23:12:09 -07:00
Treehugger Robot
77b844cb98 Merge "create_reference_dumps.py: Change lsdump_paths.txt to newline-separated paths" 2018-08-01 06:02:30 +00:00
Mathieu Chartier
79a4d778f6 Merge "Add logic for replacing maps for zip files"
am: a70bf347f7

Change-Id: Icad4d96f4e083e472b59702e8b801d0e0eb4c1ff
2018-07-31 16:36:07 -07:00
Mathieu Chartier
a70bf347f7 Merge "Add logic for replacing maps for zip files" 2018-07-31 23:22:46 +00:00
Nan Zhang
d4447a131e Merge "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk" into stage-aosp-master 2018-07-31 22:14:41 +00:00
Mathieu Chartier
fca30841f3 Add logic for replacing maps for zip files
For zip files, try to open the file in the current directory and
insert the files as mappings. This enables the script to pick up
embedded .so files.

Added a check to look in current directory before the symbol dir.

Added --app-symbols option to specify the directory containing the
app APK and so files.

Test: manual
Bug: 111268230

(cherry picked from commit b284c20247)

Merged-In: Id1b1f13bac78911daa6a72c35ebfadfdc9c1700f
Change-Id: Ia8d3dd64f16e1d06d929b4023292cb98a438ea3e
2018-07-31 14:24:29 -07:00
Nan Zhang
e5f330b940 Copy files related to sdk dev tool(activity_actions.txt, and etc.) from
offline-sdk

Originally these files were dumped to out/target/common/docs. However,
three modules(offline-sdk, offline-sdk-referenceonly, and
offline-system-sdk-referenceonly) generate these files with the same
name which might cause the problem that these files got overwritten back
and forth.

Test: m -j out/target/common/docs/offline-sdk-timestamp
Bug: b/70351683
Change-Id: Ia433796a0152bc9efacf656d06efc2a328a756a1
Merged-In: Ia433796a0152bc9efacf656d06efc2a328a756a1
2018-07-31 12:24:58 -07:00
Yi-yo Chiang
a0a9f59847 Merge "Add abi_dump_pb2.py to vndk/tools/header-checker/proto"
am: a56dfaf4de

Change-Id: Ibb9a9283b591c047a630f9b7dca402d0edd95061
2018-07-31 00:32:39 -07:00
Treehugger Robot
a56dfaf4de Merge "Add abi_dump_pb2.py to vndk/tools/header-checker/proto" 2018-07-31 07:26:01 +00:00
Nan Zhang
a6b087b37b Merge "Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from""
am: 57112d3318

Change-Id: I702f87920ab463a9b1dbcc7575de8af8e9e3c45f
2018-07-30 14:23:44 -07:00
Nan Zhang
57112d3318 Merge "Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from"" 2018-07-30 21:14:34 +00:00
Nan Zhang
18e28bdbee Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from"
This reverts commit a3aeb54513.

Reason for revert: <This CL broke the target: aosp-master/sdk>

Change-Id: I991b696afdbaf6fb2998758b91076768e476b1ed
2018-07-30 21:07:17 +00:00
Nan Zhang
2c300ea015 Merge "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk"
am: a574d1c922

Change-Id: I2370f0bc1f6e8a837b1a6b72be9703d3b31cab48
2018-07-30 13:41:44 -07:00
Nan Zhang
a574d1c922 Merge "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk" 2018-07-30 20:31:59 +00:00
Yi-yo Chiang
666a09c379 Add abi_dump_pb2.py to vndk/tools/header-checker/proto
Add the compiled python proto module so that vts tests can process lsdump.

Test: python -c 'import abi_dump_pb2'
Change-Id: I8beb6e5de8c55e2dc5bb5ecff1364892bb8c58d8
2018-07-30 09:57:24 +00:00
Nan Zhang
a3aeb54513 Copy files related to sdk dev tool(activity_actions.txt, and etc.) from
offline-sdk

Originally these files were dumped to out/target/common/docs. However,
three modules(offline-sdk, offline-sdk-referenceonly, and
offline-system-sdk-referenceonly) generate these files with the same
name which might cause the problem that these files got overwritten back
and forth.

Test: m -j out/target/common/docs/offline-sdk-timestamp
Bug: b/70351683
Change-Id: I9badab5243f0d2a14bd55e561661483365b677c2
Merged-In: I9badab5243f0d2a14bd55e561661483365b677c2
2018-07-26 16:08:35 -07:00