Commit Graph

3415 Commits

Author SHA1 Message Date
Paul Duffin d45daf6191 Merge "Conditionally remove atb from bootclasspath" 2018-01-30 11:20:50 +00:00
Tri Vo b97219cf3e Merge "Fix /sys denials." am: d8e3c4eb07 am: 55bb62895e
am: abdf6ef257

Change-Id: I54779227cbea868c6577b9df409fff7315562100
2018-01-29 22:22:58 +00:00
Tri Vo abdf6ef257 Merge "Fix /sys denials." am: d8e3c4eb07
am: 55bb62895e

Change-Id: I6507cb7c04af3e61984ea57dea553f13386403cb
2018-01-29 22:15:38 +00:00
Treehugger Robot d8e3c4eb07 Merge "Fix /sys denials." 2018-01-29 22:04:32 +00:00
Paul Duffin e2819d8456 Conditionally remove atb from bootclasspath
If REMOVE_ATB_FROM_BCP=true then this adds the
framework-atb-backward-compatibility library to the bootclasspath.

Otherwise, it adds the android.test.base library instead.

Bug: 30188076
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I3c15c35724426a9cdeef398c5bc4f5176a8fc752
2018-01-29 11:48:42 +00:00
Paul Duffin 7e4be2c085 Ensure framework-oahl-backward-compatibility is installed
Change made in response to comments on
I17170f873eec93b2e2ed7be3459e2d28c96bbe4c.

Bug: 18027885
Bug: 72375096
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I18020c495bd4f0a4a6f700edd44c2f4e7cf67826
2018-01-26 14:32:06 +00:00
Primiano Tucci 0c9dce22c0 Merge "Add perfetto daemons and cmdline client to core makefiles" am: 27be3bf0e2 am: 80f1fee17b
am: 2165431165

Change-Id: I4ddf70a18936954713459101179c4e20c0b11c2a
2018-01-25 19:04:41 +00:00
Primiano Tucci 2165431165 Merge "Add perfetto daemons and cmdline client to core makefiles" am: 27be3bf0e2
am: 80f1fee17b

Change-Id: I1794ebfe02e867dd35a03f70fce846a6852e78ec
2018-01-25 19:02:03 +00:00
Primiano Tucci 90ebe5baf2 Add perfetto daemons and cmdline client to core makefiles
Perfetto is a tracing daemon that allows both to capture
traces from the kernel (via the traced_probes binary)
and allows data to be pushed from userspace (via the
traced binary). Tracing is never enabled by default
and can be kicked off either via statsd or by the shell.
The daemon executables are split only for the sake
of security and isolating SELinux domains. Under the
hoods they are just two shells that run code in the
same shared libarary.
See go/perfetto-sys-health-details for expected
binary / memory / overhead impact.

Bug: 72484603
Test: builds (see go/perfetto-test-spec for test plan)
Change-Id: Ib5fbd7cd2113010398802b622363b75f3eef738d
2018-01-25 15:32:11 +00:00
Tri Vo 84925da809 Merge "healthd: fix /sys denials." am: 88114b0b0b am: 09f34add81
am: a7c4cc4b1d

Change-Id: I85be1510a81a8457232d16ba2a5dc4273bc85433
2018-01-25 03:08:37 +00:00
Tri Vo a7c4cc4b1d Merge "healthd: fix /sys denials." am: 88114b0b0b
am: 09f34add81

Change-Id: Iee7f7c30ed91ca6ddf126c3ce4dfa2349147349f
2018-01-25 03:02:09 +00:00
Tri Vo 82ca9a743a Fix /sys denials.
Labeled files linked from /sys/class/{rtc, net}.
Fixes these denials:
avc: denied { read } for pid=6413 comm="system_server" name="hctosys"
dev="sysfs" ino=10068 scontext=u:r:system_server:s0
tcontext=u:object_r:sysfs:s0 tclass=file permissive=0

avc: denied { write } for pid=4785 comm="Binder:4785_2" name="mtu"
dev="sysfs" ino=9213 scontext=u:r:netd:s0 tcontext=u:object_r:sysfs:s0
tclass=file permissive=0

Test: files labeled as expected; emulator boots without above denials.
Change-Id: I8fd8cc993ede0ddfd4404c0647a60da4867ef128
2018-01-24 12:39:47 -08:00
Tri Vo 30a532a1bf healthd: fix /sys denials.
Label /sys/class/power_supply/* appropriately and give healthd read
permissions to that directory.

Fixes this denial:
avc: denied { read } for pid=1386 comm="healthd" name="power_supply"
dev="sysfs" ino=2562 scontext=u:r:healthd:s0
tcontext=u:object_r:sysfs:s0 tclass=dir permissive=0

Bug: 72437093
Test: emulator boots with no denials from healthd
Change-Id: Ie3853cb5e9167fcd70f393ff589971ad6212c580
2018-01-24 11:13:22 -08:00
TreeHugger Robot afb3579213 Merge "Conditionally remove oahl from bootclasspath" 2018-01-24 09:04:39 +00:00
Justin Yun c7b3d16a85 Merge "Install ld.config.noenforce.txt instead of copying it" am: 37cc632f81 am: 7a6fafb42e
am: 8801bd4cf7

Change-Id: I0f0543d5de53093565f0ce8b556edefc54ae9817
2018-01-23 23:06:27 +00:00
Justin Yun 8801bd4cf7 Merge "Install ld.config.noenforce.txt instead of copying it" am: 37cc632f81
am: 7a6fafb42e

Change-Id: I8652310670652231d420e1f3bfadb7c30bc99986
2018-01-23 23:03:49 +00:00
Badhri Jagan Sridharan b3a8877cf7 Merge "Build usbd" am: c8cdf75d1b am: a5d0ec68bf
am: 56d3c63a3a

Change-Id: I77f30caf960067d09df8981257abc72d33135e1a
2018-01-23 18:52:49 +00:00
Badhri Jagan Sridharan 56d3c63a3a Merge "Build usbd" am: c8cdf75d1b
am: a5d0ec68bf

Change-Id: I56c167913151dff21b230b7fe0b0a0a730edce63
2018-01-23 18:41:50 +00:00
Paul Duffin 3a4f2ed718 Conditionally remove oahl from bootclasspath
If REMOVE_OAHL_FROM_BCP=true then this adds the
framework-oahl-backward-compatibility library to the bootclasspath.

Otherwise, it adds the org.apache.http.legacy instead.

Bug: 18027885
Bug: 72375096
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I17170f873eec93b2e2ed7be3459e2d28c96bbe4c
2018-01-23 17:11:24 +00:00
Adrian Roos 16d5fc1afe Merge "DisplayCutout: Add cutout emulation flavors to generic build target" 2018-01-23 15:23:55 +00:00
Justin Yun e3a7b1b4ca Install ld.config.noenforce.txt instead of copying it
ld.config.noenforce.txt is defined as a module.
For GSI, install the module instead of copying it.

Bug: 70704112
Bug: 70603313
Test: Build GSI and boot on Android-P sailfish device
Change-Id: I894921fa3089411f60d1b4f58ad48e9aa25a519b
2018-01-23 16:13:33 +09:00
Yifan Hong 1909b0c362 Merge "Add System SDK Versions to VINTF." am: c4d2725fc6 am: 1738a2315a
am: fed5564e84

Change-Id: Ic33c36bce173753d67918f6a94886ec7a7e6c0e0
2018-01-23 03:17:42 +00:00
Yifan Hong fed5564e84 Merge "Add System SDK Versions to VINTF." am: c4d2725fc6
am: 1738a2315a

Change-Id: I49be38ceec32d811eab11b45339e24c35c0faef0
2018-01-23 03:12:36 +00:00
Badhri Jagan Sridharan c8cdf75d1b Merge "Build usbd" 2018-01-23 03:09:27 +00:00
Yifan Hong 5ff1f0a38a Add System SDK Versions to VINTF.
Add PLATFORM_SYSTEMSDK_VERSIONS to framework manifest
and BOARD_SYSTEMSDK_VERSIONS to device comp matrix.

Test: m framework_manifest.xml -j
Test: BOARD_SYSTEMSDK_VERSIONS=P m device_compatibility_matrix.xml -j

Bug: 69088799
Change-Id: I0b5ac6f1c2802c353b2989b017c1cdfc9fe27987
2018-01-22 14:18:16 -08:00
Steven Moreland 274b1a5f7f Merge "Add 'blank_screen' to embedded.mk." am: 9b8fc9e3c2 am: ec92f0e5cd
am: 0e79a7750a

Change-Id: Ic3ad9c5cffa775c04839d2c6fad57adbab3e1a4e
2018-01-22 20:43:26 +00:00
Steven Moreland 0e79a7750a Merge "Add 'blank_screen' to embedded.mk." am: 9b8fc9e3c2
am: ec92f0e5cd

Change-Id: I12a5f8c46553a5d08189f7d4269dde155f8e05d6
2018-01-22 20:38:49 +00:00
Treehugger Robot 9b8fc9e3c2 Merge "Add 'blank_screen' to embedded.mk." 2018-01-22 20:27:17 +00:00
TreeHugger Robot bc1faab92a Merge "Remove default keymaster from emulator build." 2018-01-19 22:49:27 +00:00
Yifan Hong b746367c09 Merge "move VINTF metadata to /etc/vintf/ ." am: 65310d6b06 am: c77baebc5a
am: d203244288

Change-Id: Iad76b3ddfbcc922778e788ef597b9995bc7356c2
2018-01-19 22:23:04 +00:00
Yifan Hong d203244288 Merge "move VINTF metadata to /etc/vintf/ ." am: 65310d6b06
am: c77baebc5a

Change-Id: I542d0337358c9fecb8e588351bfe878864f7ba77
2018-01-19 22:18:00 +00:00
Yifan Hong 65310d6b06 Merge "move VINTF metadata to /etc/vintf/ ." 2018-01-19 22:01:28 +00:00
Steven Moreland 3ea4e46429 Add 'blank_screen' to embedded.mk.
This utility shuts off the screen.

Bug: 70846424
Test: manual + w/ init
Change-Id: I11bf8b709e81dd127de7d12c50da4ab5be456cfb
2018-01-19 13:01:13 -08:00
Adrian Roos 315118fdf1 Merge "DisplayCutout: Add emulation overlay to generic build target" 2018-01-19 20:59:42 +00:00
Adrian Roos 39837757d5 DisplayCutout: Add cutout emulation flavors to generic build target
Bug: 65689439
Test: make droid, verify DisplayCutoutEmulation{Tall,Narrow,Wide}Overlay.apk is install into vendor partition
Change-Id: Ic9d390a398fa290c421a4b0f5bbc25926480924e
2018-01-19 21:56:17 +01:00
Yifan Hong 8f863693c9 move VINTF metadata to /etc/vintf/ .
In particular,
/vendor/manifest.xml => /vendor/etc/vintf/manifest.xml
/system/manifest.xml => /system/etc/vintf/manifest.xml
/vendor/compatibility_matrix.xml =>
    /vendor/etc/vintf/compatibility_matrix.xml

Test: verify that fileis exist in destination
Test: hwservicemanager can read these files
Bug: 36790901
Change-Id: Ic361a48e170fb9a77faec76ad0e829625427820d
2018-01-19 10:52:27 -08:00
Badhri Jagan Sridharan 09935e4174 Build usbd
Bug: 63669128
Test: Manually tested whether usbd was able to configure
usb stack while boot-up.
Change-Id: I28ff31d14a6c12a7a85316f41409ceda3ca2a170
2018-01-19 06:30:13 -08:00
Justin Yun a406dbcc13 Merge "Separate vndk_snapshot_package from vndk_package" am: 866cdf8c07 am: e0b06020f8
am: cdb7eff6d0

Change-Id: Ide315b923e3b965604002019c050d2f3a0ac931b
2018-01-19 04:51:46 +00:00
SzuWei Lin 71a177265a Merge "Normalize the 2nd CPU architect of 64 bits arm GSI" am: 469aafe421
am: b52566c2ba

Change-Id: I8d46455eaf1f0d1ec6a753b569704beff5997695
2018-01-19 04:34:22 +00:00
Treehugger Robot 469aafe421 Merge "Normalize the 2nd CPU architect of 64 bits arm GSI" 2018-01-19 04:26:40 +00:00
Justin Yun cdb7eff6d0 Merge "Separate vndk_snapshot_package from vndk_package" am: 866cdf8c07
am: e0b06020f8

Change-Id: Icbf7396e0a2c65e08a757fd6dd4c353bc911ea8c
2018-01-19 04:25:46 +00:00
Treehugger Robot 866cdf8c07 Merge "Separate vndk_snapshot_package from vndk_package" 2018-01-19 03:06:34 +00:00
bohu 96e73cd33d Merge "emulator: enable 32bit x86 to run on 64bit kernel" am: 7e41fb46db am: d7c34ffac8
am: dbcfacd5f1

Change-Id: Ia2a5f2ad2d893abb1db7a9681e4360e34beab2f9
2018-01-19 02:17:49 +00:00
bohu dbcfacd5f1 Merge "emulator: enable 32bit x86 to run on 64bit kernel" am: 7e41fb46db
am: d7c34ffac8

Change-Id: Ieb72c8c6df1dab3356d1d1c5b5e98c7a4b7939b1
2018-01-19 02:13:33 +00:00
Justin Yun 992ef6c6e0 Separate vndk_snapshot_package from vndk_package
vndk_package only includes current VNDK builds without snapshots.
The snapshots will be included by PRODUCT_EXTRA_VNDK_VERSIONS
regardless of vndk_package in PRODUCT_PACKAGES.

Bug: 71609233
Test: Generate snapshot files and include the version in
      PRODUCT_EXTRA_VNDK_VERSIONS. Check if snapshots are installed.

Change-Id: If788af2f7773dd50b8b9ceb1957b8e54fde9ca9f
2018-01-19 09:51:24 +09:00
Frank Salim 7d042e642d Remove default keymaster from emulator build.
This is replaced with another default service registered from the same
binary as the strongbox keymaster in goldfish.

Test: building and running the emulator, lshal | grep keymaster

Change-Id: Ibe5f6766a426caa44302713a88fe82655931bb4b
2018-01-18 22:42:21 +00:00
bohu 1695288dc0 emulator: enable 32bit x86 to run on 64bit kernel
BUG: 71861550
Change-Id: Iea8fae11375d66a141babd40f66dd2e3da6075e0
2018-01-18 22:26:32 +00:00
Adrian Roos d1659c3e3e DisplayCutout: Add emulation overlay to generic build target
Bug: 65689439
Test: make droid, verify DisplayCutoutEmulationOverlay.apk is install into vendor partition
Change-Id: Ifbe5e35a01250b6429bc0f4a73d7c00eee24f58e
2018-01-18 13:22:32 +01:00
TreeHugger Robot 756d145ec0 Merge "Revert "Remove org.apache.http.legacy from bootclasspath"" 2018-01-18 01:58:36 +00:00
Yifan Hong 61601f2c65 Merge "add <vendor-ndk> to VINTF." am: 3fbfab7896 am: 1ddb619dc4
am: 3b1c37edfc

Change-Id: I320003ec3620353df637acc635368ab19b234bea
2018-01-18 01:01:44 +00:00