Commit graph

59198 commits

Author SHA1 Message Date
Automerger Merge Worker
d996e412db [automerger skipped] liblog: minimum_log_priority should be atomic am: 1588e9b0c2 -s ours
am skip reason: Change-Id If6c9e291f2471b96a752dc6e76e3e63458b71391 with SHA-1 bbb16022c7 is in history

Change-Id: Iad2c0a8ae42bf1b7864ad5b57b8a53937952ce4f
2020-03-10 21:04:35 +00:00
Automerger Merge Worker
3a3c6ec494 Merge "adbd: make libadbd_services cc_library again." am: 0ac447ab95
Change-Id: I0bdf847d77bd38655aad30c46044e7891766405c
2020-03-10 21:04:15 +00:00
Tom Cherry
eb20ff0be0 Merge changes Ib8a4835c,I2e11b782
* changes:
  Revert "init: handle property service callbacks asynchronously"
  Revert "Stop & Resume property service when switching to bootstrap namespace"
2020-03-10 20:44:55 +00:00
Yifan Hong
77d51eb888 Merge changes from topic "no_snapshot_callstack" into rvc-dev
* changes:
  Revert "libsnapshot::RemoveAllUpdateState log stack"
  Revert "libsnapshot callstack files readable by dumpstate"
  libsnapshot: delete InitiateMergeAndWait.
2020-03-10 19:18:48 +00:00
Tom Cherry
060f58ad35 liblog: add API level guard to NDK log.h header
Bug: 119867234
Test: build
Merged-In: I6fdd7c070af06f04314b9bf7bbfede2a106e0d7c
Change-Id: I6fdd7c070af06f04314b9bf7bbfede2a106e0d7c
(cherry picked from commit 59e93a55fc)
2020-03-10 11:55:43 -07:00
Tom Cherry
832f9f1dbd Revert "init: handle property service callbacks asynchronously"
This is apparently causing problems with reboot.

This reverts commit 7205c62933.

Bug: 150863651
Test: build
Change-Id: Ib8a4835cdc8358a54c7acdebc5c95038963a0419
2020-03-10 11:53:11 -07:00
Tianjie Xu
28f8eaeffb Create an interface for the cd entry hash table
The current implementation of the hashtable uses less memory than
a std::map. As most of the zip files we encountered don't use the zip64
extension, we should keep the current implementation. And the interface
adds the flexibility for us to switch to std::map for zip64 format.

Bug: 150900468
Test: unit tests pass
Change-Id: Ifd008785c9ff416a27049f9e0c54d9eef985bd85
2020-03-10 11:51:53 -07:00
Tom Cherry
459ca0be74 Revert "Stop & Resume property service when switching to bootstrap namespace"
Dependent change was reverted.

This reverts commit 352ae2d225.

Bug: 150863651
Test: build
Change-Id: I2e11b782fcd2b7baded133a841fdcf519f702b84
2020-03-10 11:48:24 -07:00
Tianjie Xu
0ac447ab95 Merge "adbd: make libadbd_services cc_library again." 2020-03-10 18:43:30 +00:00
Automerger Merge Worker
166cdef852 Merge changes from topic "no_snapshot_callstack" am: 86008cccb3 am: 944d5b0656
Change-Id: I596232c54f11128fb51bed92d52253038b3d6bb0
2020-03-10 17:47:09 +00:00
Automerger Merge Worker
d61dd279ff Merge changes from topic "no_snapshot_callstack" am: 86008cccb3 am: 944d5b0656
Change-Id: I75b06c11c6a0c76bdf567ac54119e76f31db38e9
2020-03-10 17:47:03 +00:00
Automerger Merge Worker
944d5b0656 Merge changes from topic "no_snapshot_callstack" am: 86008cccb3
Change-Id: I9b061b9a8197be2d91cb7aa6b7db23f2c5fb2ec5
2020-03-10 17:26:01 +00:00
Yifan Hong
86008cccb3 Merge changes from topic "no_snapshot_callstack"
* changes:
  Revert "libsnapshot::RemoveAllUpdateState log stack"
  Revert "libsnapshot callstack files readable by dumpstate"
  libsnapshot: delete InitiateMergeAndWait.
2020-03-10 17:08:54 +00:00
Automerger Merge Worker
0869fc1eff Merge "liblog: add API level guard to NDK log.h header" am: cc032194b3 am: 58894ac28e
Change-Id: I2c6ccf7b069a508963cfab9ffc0a63d6266ebb9a
2020-03-10 16:33:28 +00:00
Automerger Merge Worker
68d1754d49 Merge "liblog: add API level guard to NDK log.h header" am: cc032194b3 am: 58894ac28e
Change-Id: Ieb1bcb4a6542b9f12cc07f55f6ec28e809b68c69
2020-03-10 16:33:27 +00:00
Automerger Merge Worker
58894ac28e Merge "liblog: add API level guard to NDK log.h header" am: cc032194b3
Change-Id: I27428102301041120007667f7aa0e1b9c4de1e52
2020-03-10 16:16:47 +00:00
Tom Cherry
cc032194b3 Merge "liblog: add API level guard to NDK log.h header" 2020-03-10 16:00:44 +00:00
Tom Cherry
59e93a55fc liblog: add API level guard to NDK log.h header
Bug: 119867234
Test: build
Change-Id: I6fdd7c070af06f04314b9bf7bbfede2a106e0d7c
2020-03-10 08:50:46 -07:00
Tom Cherry
1588e9b0c2 liblog: minimum_log_priority should be atomic
In case multiple threads try to reference this variable while it is
being set, it should be atomic so that all threads always see a valid
value.

Bug: 150898477
Test: liblog, libbase unit tests
Merged-In: If6c9e291f2471b96a752dc6e76e3e63458b71391
Change-Id: If6c9e291f2471b96a752dc6e76e3e63458b71391
(cherry picked from commit bbb16022c7)
2020-03-10 08:46:15 -07:00
Automerger Merge Worker
8adced3e87 Merge "Convert gsid to use the dynamic AIDL service infrastructure" am: 14326821f0 am: 0d0e8f6a4a
Change-Id: I43cb82e3fb51ae5f947ede2ea765dd72a402a83c
2020-03-10 10:28:16 +00:00
Automerger Merge Worker
0e3475db49 Merge "Convert gsid to use the dynamic AIDL service infrastructure" am: 14326821f0 am: 0d0e8f6a4a
Change-Id: I111d02c6a2fabf5129678ac6551c3702568b0765
2020-03-10 10:28:16 +00:00
Automerger Merge Worker
0d0e8f6a4a Merge "Convert gsid to use the dynamic AIDL service infrastructure" am: 14326821f0
Change-Id: Id69799c15b20dd2deb74cd80386c6ff8861da33d
2020-03-10 10:11:48 +00:00
Howard Chen
14326821f0 Merge "Convert gsid to use the dynamic AIDL service infrastructure" 2020-03-10 09:49:01 +00:00
Howard Chen
c7e257c1e9 Convert gsid to use the dynamic AIDL service infrastructure
Replace the original on demand start mechanism with the new dynamic
AIDL service infrastructure to resolve a possible race condition.

Bug: 149130673
Test: gsi_tool status

Merged-In: Ia5f32579a8dcf62d700d974c7f4e3c65647f3b8b
Change-Id: Ia5f32579a8dcf62d700d974c7f4e3c65647f3b8b
2020-03-10 17:35:41 +08:00
Automerger Merge Worker
6bade7f7a8 Merge "Set apex_available property" am: 2401f5f2cc am: bacaf76c0e
Change-Id: I86d74a6603acf59fadb16d7d16831b12ec5a2c83
2020-03-10 08:08:28 +00:00
Automerger Merge Worker
163f424c63 Merge "Set apex_available property" am: 2401f5f2cc am: bacaf76c0e
Change-Id: Ib0deaf7eedc55db15763d591a2c3a85bdff67190
2020-03-10 08:08:26 +00:00
Automerger Merge Worker
bacaf76c0e Merge "Set apex_available property" am: 2401f5f2cc
Change-Id: I6b870349f9c526bda074e045ed52ffbd93b11249
2020-03-10 07:56:11 +00:00
Treehugger Robot
2401f5f2cc Merge "Set apex_available property" 2020-03-10 07:30:36 +00:00
Automerger Merge Worker
e56f3b501b Merge "Convert vts configs to Android.bp" am: ecfdda2c14 am: e888ebcbae
Change-Id: I7cbe2f30bebb9e410625ca03737db85db119facf
2020-03-10 05:39:29 +00:00
Automerger Merge Worker
bfbc204b69 Merge "Convert vts configs to Android.bp" am: ecfdda2c14 am: e888ebcbae
Change-Id: I915e446b6230de32cb015a19a9f14adedf2095b3
2020-03-10 05:39:28 +00:00
Automerger Merge Worker
e888ebcbae Merge "Convert vts configs to Android.bp" am: ecfdda2c14
Change-Id: I7159313ba7948da3a0a9c55ef527cb23e88058f6
2020-03-10 05:23:01 +00:00
Treehugger Robot
ecfdda2c14 Merge "Convert vts configs to Android.bp" 2020-03-10 05:00:33 +00:00
Automerger Merge Worker
09b6fe4cdb Merge "adb: defer acknowledgement of pushed files until the end." am: 2263bcb4d0 am: 0cd6658eb0
Change-Id: Ib78ddc058a837e12ea33f383ac63b51642d4d5b8
2020-03-10 02:23:34 +00:00
Automerger Merge Worker
e6ba52ffbe Merge "adb: defer acknowledgement of pushed files until the end." am: 2263bcb4d0 am: 0cd6658eb0
Change-Id: I351c406ef5abfc55b1607bfa520f3f1d16002bbf
2020-03-10 02:23:32 +00:00
Automerger Merge Worker
0cd6658eb0 Merge "adb: defer acknowledgement of pushed files until the end." am: 2263bcb4d0
Change-Id: Id6c15f4dd7604b35d5ae6b4847517c1ff32899bd
2020-03-10 02:12:06 +00:00
Josh Gao
6519ad6355 adb: defer acknowledgement of pushed files until the end.
Previously, we were waiting for the other end to respond after every
file sent, which results in massive slowdown when there's any amount of
latency on the transport.

This improves performance on a cuttlefish instance with ~7ms RTT from:

    system/: 2037 files pushed, 0 skipped. 2.8 MB/s (762803979 bytes in 262.964s)

to:

    system/: 2037 files pushed, 0 skipped. 11.9 MB/s (762803979 bytes in 61.278s)

Bug: https://issuetracker.google.com/150827486
Test: ./test_device.py
Change-Id: I3a0c893faa5d455cc6ccbc86915a17e1b5abbfbe
(cherry picked from commit 64ff82ba68)
2020-03-09 18:57:15 -07:00
Josh Gao
2263bcb4d0 Merge "adb: defer acknowledgement of pushed files until the end." 2020-03-10 01:55:51 +00:00
Jiyong Park
5280b5c03e libbase uses liblog symbols via dlsym when it is built for APEX
libbase is a popular library that is used by many APEXes either directly
or transitively. It is being used by several Mainline modules that were
launched with Q, in which case everything in the APEX - including
libbase - shouldn't use new APIs that are added post Q, i.e. R.

libbase however is using a few new R symbols from liblog, and this is
preventing those Q-launching Mainline modules that are built in R source
tree from being installed to Q devices.

Fortunately, the dependencies to the new R symbols are guarded with a
flag; when the existence of the symbols are not guaranteed, it uses
dlsym. This change fixes the aforementioned problem by turning on the
flag also when libbase is built for an APEX.

Bug: 149569129
Test: TARGET_BUILD_APPS=com.android.media
vendor/google/build/build_mainline_modules.sh
adb install --staged out/dist/mainline_modules_arm64/com.android.media.apex
adb reboot
The APEX is installed and mediaextractor process doesn't crash

Change-Id: I44b5ec028850613cb45fc3e792f43cd8e87cfd00
2020-03-10 10:08:26 +09:00
Jiyong Park
7c8e2b247d Whole static link libasync_safe to libbacktrace.a
When libbacktrace.a is statically lined to somewhere, that library had
to add libasync_safe.a to static_libs because libbacktrace.a has
references to libasync_safe.a. But libbacktace depending on
libasync_safe is an implementation detail of libbacktrace, and therefore
its client shouldn't be affected by it.

Fixing this by doing the whole static link to libasync_safe to
libbacktrace.a so that the former is included in libbacktrace.a

Bug: 149569129
Test: m
Change-Id: If7366a240bc945dda9944fe7c111e10d328165bb
2020-03-10 10:08:26 +09:00
Automerger Merge Worker
aaebb0534c Merge "Fix bugprone-string-integer-assignment warnings" am: 262b58cd07 am: 9b69f80df2
Change-Id: Ie2c0fa76223cafe28249e26e945b017ad8e260db
2020-03-10 00:48:47 +00:00
Automerger Merge Worker
51d9cee112 Merge "Fix bugprone-string-integer-assignment warnings" am: 262b58cd07 am: 9b69f80df2
Change-Id: I1b35735cae7c6818ae8e003206aaf26d442e419d
2020-03-10 00:48:42 +00:00
Automerger Merge Worker
4408272125 Merge "libdm: Fix WaitForFile early-returning on failed accesses." am: 66147bad94 am: 8ae833f2e2
Change-Id: I486ca7a57def22c94b632069db00ec01616eac7b
2020-03-10 00:48:42 +00:00
Automerger Merge Worker
c98dfd7f11 Merge "[automerger skipped] Merge "libdm: Fix WaitForFile early-returning on failed accesses." am: 66147bad94 am: 8ae833f2e2 -s ours am skip reason: Change-Id I0c78818962e1db91b556e523c418db28f7d78fae with SHA-1 44ae546061 is in history" into rvc-dev-plus-aosp 2020-03-10 00:48:40 +00:00
Automerger Merge Worker
613da2d6b1 [automerger skipped] Merge "libdm: Fix WaitForFile early-returning on failed accesses." am: 66147bad94 am: 8ae833f2e2 -s ours
am skip reason: Change-Id I0c78818962e1db91b556e523c418db28f7d78fae with SHA-1 44ae546061 is in history

Change-Id: I59f64c1d252937fc6978809203f486aed60e3e52
2020-03-10 00:48:35 +00:00
Automerger Merge Worker
dc174dcecd Use dlsym to load libstatssocket API am: 7a287d0751
Change-Id: I114a4a5604381bdffb09ca8639422caa8f3597ab
2020-03-10 00:48:32 +00:00
Automerger Merge Worker
9b69f80df2 Merge "Fix bugprone-string-integer-assignment warnings" am: 262b58cd07
Change-Id: I0b060938438f06ed35d5e669efa23926aa77c85a
2020-03-10 00:29:42 +00:00
Automerger Merge Worker
8ae833f2e2 Merge "libdm: Fix WaitForFile early-returning on failed accesses." am: 66147bad94
Change-Id: I96c24c1b8d0941d291505e7668fdeda37542bdba
2020-03-10 00:29:20 +00:00
Chih-hung Hsieh
262b58cd07 Merge "Fix bugprone-string-integer-assignment warnings" 2020-03-10 00:07:58 +00:00
David Anderson
66147bad94 Merge "libdm: Fix WaitForFile early-returning on failed accesses." 2020-03-10 00:06:09 +00:00
Automerger Merge Worker
6abf07dd22 Merge "Remove mips build." am: b34449d5fe am: 7f74c78779
Change-Id: Ica69d541091374ea485a34821e61807b8dd68c96
2020-03-09 23:53:46 +00:00