Commit Graph

3439 Commits

Author SHA1 Message Date
Christopher Ferris f7352709ef Merge "Add libc_malloc_hook to list of libraries." 2018-02-13 21:21:32 +00:00
Chenbo Feng 53e5a438a8 Merge "Add bpfloader binary to system image" am: 5502f9958a am: 5880e5d7b6
am: 5443668bb0

Change-Id: Ia0112717e4a9dc55ae644f92fe071b9cbb18d2c7
2018-02-13 07:11:57 +00:00
Chenbo Feng 5443668bb0 Merge "Add bpfloader binary to system image" am: 5502f9958a
am: 5880e5d7b6

Change-Id: I0d28c3e36609f35cc187de50cb154095081d555e
2018-02-13 06:59:42 +00:00
Christopher Ferris 8c70d4de97 Add libc_malloc_hook to list of libraries.
Bug: 30561479

Test: Build from scratch and verify the library is present.
Change-Id: I53f30d694cff202ffc93491485ed3c845de07862
2018-02-13 04:09:44 +00:00
Chenbo Feng 2b948a2259 Add bpfloader binary to system image
The bpfloader is a executable binary used by netd to load and attach
networking related bpf program at run time. It need to be flashed to
device when updating the system image. Currently this binary is only
used by devices with kernel version 4.9 or above.

Test: hikey boot and bpf program show up under sys/fs/bpf
Bug: 30950746
Change-Id: I3d14d270a04ea57319ad4292ff51b1cf933fc975
2018-02-09 15:17:22 -08:00
Michael Wright 74e5ccb28b Merge "Revert "Correct some GSI settings to board makefile"" am: 0b733a2036 am: e869d4e158
am: 80a013a7e2

Change-Id: I30ffb6bc51f7e41c5a90472d078ba8f47384402e
2018-02-07 15:25:19 +00:00
Michael Wright 80a013a7e2 Merge "Revert "Correct some GSI settings to board makefile"" am: 0b733a2036
am: e869d4e158

Change-Id: I690d03dbee97f97fb98e67f403dce7654f3d0810
2018-02-07 15:19:44 +00:00
Michael Wright 0b733a2036 Merge "Revert "Correct some GSI settings to board makefile"" 2018-02-07 15:11:07 +00:00
Michael Wright 87163300c2 Revert "Correct some GSI settings to board makefile"
This reverts commit 6e96487968.

Reason for revert: build_test broken by this change.

Change-Id: I0f48bb84dc8c521540c745814daa11c2900ac2c8
2018-02-07 12:08:51 +00:00
SzuWei Lin fce672a2bd Merge "Correct some GSI settings to board makefile" am: 2f7f7ca1c0 am: 0c6f675b62
am: 2646ca50e5

Change-Id: If8bb17c3477b474c5f96130e1a5db4c20ab0a4a0
2018-02-07 10:42:30 +00:00
SzuWei Lin 2646ca50e5 Merge "Correct some GSI settings to board makefile" am: 2f7f7ca1c0
am: 0c6f675b62

Change-Id: I32de3a5d39b9759bb3dcdde930a314c2e7833cb0
2018-02-07 09:14:43 +00:00
Treehugger Robot 2f7f7ca1c0 Merge "Correct some GSI settings to board makefile" 2018-02-07 09:02:40 +00:00
hansson 57c4dd849d Merge "Add a base makefile for 64 bit only builds." am: ee00360292 am: bd5bb92f81
am: 05692c2dca

Change-Id: I4fe1d9c42dcaca433b1bfd2af122bd23f0a8c9fd
2018-02-06 10:24:19 +00:00
hansson 05692c2dca Merge "Add a base makefile for 64 bit only builds." am: ee00360292
am: bd5bb92f81

Change-Id: I8ad948162f07246f670374474d9eafb0396c915a
2018-02-06 10:20:16 +00:00
hansson ee00360292 Merge "Add a base makefile for 64 bit only builds." 2018-02-06 10:08:48 +00:00
Yifan Hong 2c2a24421a Merge "Move system manifest / device matrix build rules" am: fe34c5b52c am: 6e79817411
am: 19687f25f0

Change-Id: I897635ade816d146f41ef3a3421e16446e9d0252
2018-02-06 02:29:27 +00:00
Yifan Hong 19687f25f0 Merge "Move system manifest / device matrix build rules" am: fe34c5b52c
am: 6e79817411

Change-Id: I1590e890c63218451c4ecf56d5526c9edda38e1d
2018-02-06 02:21:50 +00:00
Treehugger Robot fe34c5b52c Merge "Move system manifest / device matrix build rules" 2018-02-05 22:27:18 +00:00
Carmen Jackson 152118d631 Merge "Add Traceur to user builds." am: a3a211dafe am: 5de6e57714
am: 3c4dd281d0

Change-Id: I8b1ffbfba434a453d7576993022a9121320f76fe
2018-02-05 20:52:36 +00:00
Carmen Jackson 3c4dd281d0 Merge "Add Traceur to user builds." am: a3a211dafe
am: 5de6e57714

Change-Id: I9c237fb287a9b782446d736bb9d41c8b86a3c8d9
2018-02-05 20:48:33 +00:00
Anton Hansson 1ac8a6df9a Add a base makefile for 64 bit only builds.
This makefile specifies a configuration that only starts a 64 bit
zygote (as opposed to both 64/32, as standard 64 bit builds do).
It should be inherited by products that only supports 64 bit apps.

Bug: 72810053
Test: Manual, using product in https://android-review.googlesource.com/608276
Change-Id: Ib88eccf8d4c575bfd93d6edb130348aeca4ae3f8
2018-02-05 18:24:16 +00:00
Carmen Jackson 343428120a Add Traceur to user builds.
This adds the Traceur app to all builds on phones and tablets.
Previously, it was included on userdebug builds on specific devices only.

Bug: 64762598
Test: Flashed a user build and a userdebug build and saw Traceur on both
builds.

Change-Id: I9bf7d68c737845a519f57f8f60ee9064bf33a2f5
2018-02-02 11:19:49 -08:00
Yifan Hong 87328762e4 Move system manifest / device matrix build rules
Test: build these files
Change-Id: I6467f4b7ce421358c30ad7a4c72a77dcc2ed3f88
2018-02-01 15:36:40 -08:00
Paul Duffin d45daf6191 Merge "Conditionally remove atb from bootclasspath" 2018-01-30 11:20:50 +00:00
SzuWei Lin 6e96487968 Correct some GSI settings to board makefile
TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS should
be board config variables. Move them to
target/board/treble_common_64.mk

Bug: 70951849
Test: lunch aosp_arm64_ab-userdebug; make -j
Change-Id: Ia3f6d5db1a7edc956597ab34c2feed088ecc6062
2018-01-30 17:23:47 +08: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