Commit Graph

103 Commits

Author SHA1 Message Date
Sasha Smundak
b61bab6a58 Convert Android.mk file to Android.bp
Files failing automerge from AOSP.
See build/soong/README.md for more information.

Bug: 122332340
Test: treehugger
Change-Id: I92f7584aeaf502336f67e04fbc22634784c9305d
2019-03-26 15:18:41 -07:00
Colin Cross
cd18790959 Merge "Fix ODR issue in viewcompiler" am: b9879d00c4 am: d1e12a6112
am: bf200e78a8

Change-Id: Ib8afbe33ef39a140e8d9855a13aa1296a6b5bd61
2019-03-21 01:44:16 -07:00
Colin Cross
d1e12a6112 Merge "Fix ODR issue in viewcompiler"
am: b9879d00c4

Change-Id: I2fda6bdf7ebc082a732d75d55694d47f5a755fdc
2019-03-21 01:23:40 -07:00
Colin Cross
d7632929ea Fix ODR issue in viewcompiler
libz is already linked as a static library through
libdexfile_static_defaults, don't also link it as a shared library.
Fixes:
=================================================================
==43189==ERROR: AddressSanitizer: odr-violation (0x55d1ed723a60):
[1] size=48 'inflate_copyright' external/zlib/src/inftrees.c:11:12
[2] size=48 'inflate_copyright' external/zlib/src/inftrees.c:11:12
These globals were registered at these points:
[1]:
 #0 0x55d1ed769a0e (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0xf3a0e)
 #1 0x55d1ed991b1b (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0x31bb1b)

[2]:
 #0 0x55d1ed769a0e (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0xf3a0e)
 #1 0x7f5dff20a09b (/buildbot/src/android/master/out/soong/host/linux-x86/bin/../lib64/libz-host.so+0x3e09b)

Test: m SANITIZE_HOST=address viewcompiler && viewcompiler
Change-Id: I4ebdf7ef4ec1641488fbc25275dbf6aa0cdbe2eb
2019-03-20 21:19:57 -07:00
Brett Chabot
502ec7ae4b Migrate remainder of frameworks/base to androidx.test
See go/jetpack-test-android-migration

Exempt-From-Owner-Approval: automated package name refactoring

Test: m  m -j BroadcastRadioTests KeystoreTests mediaframeworktest ActivityManagerPerfTests AppLaunch AppLaunchWear BackgroundDexOptServiceIntegrationTests AppCompatibilityTest DynamicCodeLoggerIntegrationTests FlickerLibTest InternalTests PackageWatchdogTest RcsTests RollbackTestAppAv1 RollbackTestAppAv2 RollbackTestAppACrashingV2 RollbackTestAppBv1 RollbackTestAppBv2 RollbackTestAppASplitV1 RollbackTestAppASplitV2 RollbackTest ServiceCrashTest UsageStatsPerfTests UsbTests WindowAnimationJank
Change-Id: I32fe3297656eec6060da6c7e24582bcd5315fb16
2019-03-02 00:35:17 +00:00
Xin Li
b455c3a7f3 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I2f9a524f2ba552de3f62e343075cf0abf400bbae
2019-02-21 16:02:06 -08:00
Chih-hung Hsieh
d8b390c88b Merge "Add default code reviewers into OWNERS" am: e45eefe8ec am: 3a59c9f70e
am: f59468295e

Change-Id: I1f5055c6c83f1659b4a75cc4af2008d89c622195
2019-02-06 22:51:55 -08:00
Chih-hung Hsieh
f59468295e Merge "Add default code reviewers into OWNERS" am: e45eefe8ec
am: 3a59c9f70e

Change-Id: I65f8c7aa64ee34388341c6e8687adc3dbdcfa595
2019-02-06 22:42:47 -08:00
Chih-Hung Hsieh
34cd77a651 Add default code reviewers into OWNERS
Bug: 33166666
Test: gerrit uploader
Change-Id: Ief5d4bf9005bb3a712803101f98dd2b876662eb8
2019-02-06 22:19:19 -08:00
Chih-hung Hsieh
fd1dcbde32 Merge "Work around clang-tidy bug in dex_builder.cc." am: c6036971e7 am: 24a986bfb1
am: acd74cfac0

Change-Id: Id213b483d0439dd03f198552d8ca78831347256a
2019-02-06 14:56:37 -08:00
Chih-hung Hsieh
acd74cfac0 Merge "Work around clang-tidy bug in dex_builder.cc." am: c6036971e7
am: 24a986bfb1

Change-Id: Ic46821b9512dc4b73ce153202012984a714649c5
2019-02-06 14:34:50 -08:00
Chih-Hung Hsieh
2b61bddc1a Work around clang-tidy bug in dex_builder.cc.
Bug: 123880763
Test: build with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=*,-readability-*,
    -google-readability-*,-google-runtime-references,-cppcoreguidelines-*,
    -modernize-*,-llvm-*,-bugprone-narrowing-conversions,
    -misc-non-private-member-variables-in-classes,
    -misc-unused-parameters,-hicpp-*,-fuchsia-*

Change-Id: Ibf80f951ae2369a55570770febe8a1c4422181e1
2019-02-05 17:11:05 -08:00
Chih-Hung Hsieh
eb009eb990 Merge "Temporarily disable clang-tidy for dex_builder.cc." am: 171dfad60c am: e6d84ae4c9
am: 6cb189e322

Change-Id: I65741102dfe0989c82f4244ef4c45954129dd513
2019-02-04 22:17:39 -08:00
Chih-Hung Hsieh
6cb189e322 Merge "Temporarily disable clang-tidy for dex_builder.cc." am: 171dfad60c
am: e6d84ae4c9

Change-Id: I13efd650ad82f46e7c060558809109b72de17047
2019-02-04 21:36:52 -08:00
Chih-Hung Hsieh
7ae7f169fb Temporarily disable clang-tidy for dex_builder.cc.
Bug: 123880763
Test: build with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=*,-readability-*,
-google-readability-*,-google-runtime-references,-cppcoreguidelines-*,
-modernize-*,-llvm-*,-bugprone-narrowing-conversions,
-misc-non-private-member-variables-in-classes,
-misc-unused-parameters,-hicpp-*,-fuchsia-*

Change-Id: I7be72b9db232a375bf7caf3b2dbeb9c6f7368a8e
2019-02-04 10:35:55 -08:00
Eric Holk
846b59eafa Merge "[viewcompiler] Support more than 16 registers in invoke instructions" am: f96ebc501e am: 18fa74cbe4
am: 1660db4818

Change-Id: Ie3c443c1cff90d5bbceb4a067963f1009259de7f
2019-02-01 13:32:41 -08:00
Eric Holk
1660db4818 Merge "[viewcompiler] Support more than 16 registers in invoke instructions" am: f96ebc501e
am: 18fa74cbe4

Change-Id: I2bbe8793d7bf3b1e06ec5576ba250f10a0f9c304
2019-02-01 12:44:32 -08:00
Treehugger Robot
f96ebc501e Merge "[viewcompiler] Support more than 16 registers in invoke instructions" 2019-02-01 18:57:18 +00:00
Eric Holk
baa8e66c0e Merge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING" am: 1cb64c6a85 am: d8ec417dd6
am: 55398cf19d

Change-Id: I55026e983954f5af3913eaf0a5caa93721ffa796
2019-01-31 19:27:53 -08:00
Eric Holk
55398cf19d Merge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING" am: 1cb64c6a85
am: d8ec417dd6

Change-Id: I12273695d8318900d325436ebb252b287517c367
2019-01-31 19:17:13 -08:00
Eric Holk
d1b4383660 [viewcompiler] Support more than 16 registers in invoke instructions
This was causing the viewcompiler to crash on deeper layout hierarchies.

We fix this by reserving several scratch registers. When an invoke instruction
uses registers that don't fit in a 4-bit field, we move all of these values into
the scratch registers and use an invoke/range instruction instead. The scratch
registers are all above the highest allocated register, so they are guaranteed
not to clobber meaningful values.

Supporting more registers for invoke also required supporting
register-to-register moves, which some how we'd gotten by without so far.

Finally, to make viewcompiler fail more loudly when things go wrong, many
DCHECKs have been changed to CHECKs.

Bug: 123517491
Test: atest
Change-Id: I9eb7c9bcf1fc7d713e664b331804bdcddafc95a4
2019-01-31 15:15:14 -08:00
Eric Holk
8c933e5a9d [viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING
PrecompiledLayoutTest makes sure that layouts generated by the viewcompiler are
equivalent to inflating from the resource XML file. We'll want to run these
tests when making changes to the viewcompiler.

Bug: 111895153
Test: atest
Change-Id: Iffa6f0f01c3f43d43feaabd1a5cd36be76650975
2019-01-31 21:22:06 +00:00
Mathieu Chartier
6565a34d7f Disable iorap test mapping
Post submit tests are failing, disable the tests for now.

Bug: 123659771
Bug: 72170747
Test: TH
Change-Id: I17befa52ebad92413122253f692168cf93cbab6e
2019-01-31 09:36:55 -08:00
Mathieu Chartier
40938a5543 iorap: Fix ro.iorapd.enable property naming
Rename from iorapd.enable to ro.iorapd.enable to match init scripts.

This avoids logspam when iorapd is disabled.

Bug: 123637697
Test: reboot and look at logcat
Change-Id: I741071918ba16191890f3fe3de3764013e0e4ee1
2019-01-30 21:04:45 +00:00
Mathieu Chartier
d8695d069d Disable presubmit test until it works with disabled iorap by default
Bug: 123595428
Bug: 72170747
Test: TH

Change-Id: I752e81732a516e56fca6f0df2c5b7cbb1d3214e5
2019-01-30 00:33:07 +00:00
Orion Hodson
f34d9f7354 Merge "startop: use static_lib dependency on libdexfile." am: ff1aa4e49a am: db28e6e8b1
am: 0c024ea711

Change-Id: Iaf750da3c21946f10646a385258094de462a92b1
2019-01-28 21:15:13 -08:00
Orion Hodson
0c024ea711 Merge "startop: use static_lib dependency on libdexfile." am: ff1aa4e49a
am: db28e6e8b1

Change-Id: I64907bda16a8f248a27eb643b6a4621860c30928
2019-01-28 20:54:34 -08:00
Orion Hodson
ca1b80b52e startop: use static_lib dependency on libdexfile.
libdexfile.so is moving to APEX and the external API doesn't include
the features needed for startop.

Bug: 119632407
Test: Builds
Change-Id: I6d33e8737341a508637321921ca732af913827a3
2019-01-28 13:32:37 +00:00
TreeHugger Robot
ecc22e2f0e Merge changes I789db896,I19e91f0f
* changes:
  iorap: Handle binder failures by gracefully attempting to reconnect
  iorap: Update AppLaunchEvent binder calls to use protobuf
2019-01-25 19:10:34 +00:00
Igor Murashkin
9d33ee90ce iorap: Handle binder failures by gracefully attempting to reconnect
Also hide down functionality behind setprops:
* Debug logging (log.tag.ForwardingService VERBOSE)
* Log.wtf instead of crashing (iorapd.forwarding_service.wtf_crash true)
* Don't connect to binder if iorapd is disabled (iorapd.enable true)

The primary benefit of this is that:
a) If iorapd acts funny (or crashes) for any reason, it doesn't take down system server.
b) If developer manually runs 'adb shell stop iorapd', it won't crash
system server, and it doesn't need a restart ('adb shell stop/start') to
re-establish the binder connection.

Reconnections are done by sleeping forever in a 1-second loop.

Bug: 72170747
Test: adb shell stop && adb shell start # and manually set adb shell props
Test: atest system/iorap
Change-Id: I789db8962dc8498b1028639274cd34a0310b84c1
2019-01-24 14:39:49 -08:00
Mathieu Chartier
55d66bb419 Fix OWNERS sorting
Was not alphabetical before.

Test: N/A

Change-Id: I2dcd11076ae1580ca0714747d4b11b808866f72e
2019-01-23 10:15:20 -08:00
Mathieu Chartier
1e3c00cb28 Add mathieuc to OWNERS for startop
Bug: 111397239
Test: n/a
Change-Id: Ib4765833140c8c53806b48e4fcd4a3870931ea5d
2019-01-22 15:39:50 -08:00
Igor Murashkin
e9e439a47c iorap: Update AppLaunchEvent binder calls to use protobuf
* Also makes a minor change to android.os.Intent to allow writing it
into a protobuf without needing an outer field ID. This makes it
directly unserializable into a C++ code-generated protobuf as a root
proto.

Bug: 72170747
Change-Id: I19e91f0f9c5e5a37810a430e9c483e7752af54d7
Test: atest system/iorap
2019-01-22 14:39:06 -08:00
Eric Holk
a15f36a605 Merge "[viewcompiler] Enable input from file descriptor" am: 040579c6a3 am: 88f9ca38fb
am: 2c6aa62cee

Change-Id: I4dac81fb372c64207bcc2748a99b8686bc53959b
2019-01-15 14:11:54 -08:00
Eric Holk
2c6aa62cee Merge "[viewcompiler] Enable input from file descriptor" am: 040579c6a3
am: 88f9ca38fb

Change-Id: I828cd906b95daac5f74d2cc0289c211ade0be1d9
2019-01-15 14:00:35 -08:00
Eric Holk
0e0e7dde92 [viewcompiler] Enable input from file descriptor
This is needed to be able to launch the viewcompiler from installd. We only
support FD-input mode when reading from APKs. For output to an FD, we rely on
stdout redirection.

Bug: 111895153
Change-Id: I3025d83c60494485bada5f2f4cd67e25354d1d53
2019-01-15 10:03:46 -08:00
Eric Holk
e8bacb0ff1 Merge "Make viewcompiler available on device" am: eb678ba1d3 am: a3e9526ea8
am: 9f69619a97

Change-Id: Ic54866452468f545506afe487c326f377fbf382b
2019-01-14 15:06:22 -08:00
Eric Holk
9f69619a97 Merge "Make viewcompiler available on device" am: eb678ba1d3
am: a3e9526ea8

Change-Id: I4ddbb337967a7e072d69d024fe7c92099e7dce4b
2019-01-14 14:25:25 -08:00
Eric Holk
bf30e31acc Make viewcompiler available on device
We'll need this binary on device to be able to compile views at application
install time. There will be a followup CL to the build system to make sure
viewcompiler is built and installed by default.

Bug: 111895153
Change-Id: I2c98864118dfeca79e36be760bd44b9afa03b4d4
2019-01-14 10:25:40 -08:00
Eric Holk
3d91b513f9 Merge "[view compiler] Compile all layouts in an APK" am: a95eac0c59 am: 0ca2e2c2dd
am: 72ffe3b785

Change-Id: I6f16b1be188a8a2539f595d221a7a0f3d38ea175
2019-01-08 10:49:25 -08:00
Eric Holk
72ffe3b785 Merge "[view compiler] Compile all layouts in an APK" am: a95eac0c59
am: 0ca2e2c2dd

Change-Id: I9106f0893aef1569b7ba6b9944cc2d7b8081ee94
2019-01-08 10:28:53 -08:00
Eric Holk
b377e5177e [view compiler] Compile all layouts in an APK
Test: atest
Bug: 111895153
Change-Id: I5f4b9b4c1160acf1c04a4492f5e3a736fbaf2fdc
2019-01-07 14:40:44 -08:00
Igor Murashkin
4de1e16570 services: Add iorap forwarding service
Add a new service to system_server. It purely forwards
data from internal APIs to iorapd over binder, it is not a binder
service itself.

Currently forwards ActivityMetricsLaunchObserver APIs from
ActivityTaskManagerInternal.

Bug: 72170747
Change-Id: Ic4fa283df1c16660099030c74a0039ef24866819
2019-01-07 13:46:47 -08:00
Eric Holk
ffdf092a77 Merge "[view compiler] Add XML to DEX compilation" am: d426ee84a0 am: 755467bb4f
am: c31debe037

Change-Id: Ib457db49ebdade8a9b9e8d52ceeb64d5aee4bbd6
2019-01-07 10:20:09 -08:00
Eric Holk
c31debe037 Merge "[view compiler] Add XML to DEX compilation" am: d426ee84a0
am: 755467bb4f

Change-Id: I32e325db7d9176910e271b721c0adf1b98d1a688
2019-01-07 10:08:49 -08:00
Eric Holk
4273457c9e [view compiler] Add XML to DEX compilation
Test: atest
Bug: 111895153
Change-Id: I91c01ff4474e080c87b902ae963b5d655346f859
2019-01-05 01:36:05 +00:00
Eric Holk
4d4ce90805 Merge "[view-compiler] Better namespacing of util functions" am: ff77ea8d58 am: 36c3953339
am: b63e813feb

Change-Id: I29c804c0342649f325c4b95981f7deb18c3a04e0
2019-01-02 11:58:45 -08:00
Eric Holk
b63e813feb Merge "[view-compiler] Better namespacing of util functions" am: ff77ea8d58
am: 36c3953339

Change-Id: I5aa433d38991ec73280b267076ca20b784a032f8
2019-01-02 11:46:15 -08:00
Eric Holk
ddc8990f09 [view-compiler] Better namespacing of util functions
This moves some helper functions into our own namespace to avoid conflicting
with other util.h files.

Bug: 111895153
Change-Id: I2b4c77732a97b34a8528d69867c15ed802686703
2019-01-02 18:02:31 +00:00
Eric Holk
ff709020ab Merge "[view compiler] Re-enable host-side tests" am: abe06f9138 am: ca50bb3980
am: 531c40f8b8

Change-Id: I61dbe3cc58aa124ec0691f474261e62fad058d00
2019-01-02 08:31:19 -08:00