Commit graph

3518 commits

Author SHA1 Message Date
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
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
Yifan Hong
3b1c37edfc Merge "add <vendor-ndk> to VINTF." am: 3fbfab7896
am: 1ddb619dc4

Change-Id: I2a2891d46a2bdae39101411d0f45bc6eae9fd2f4
2018-01-18 00:59:28 +00:00
Przemyslaw Szczepaniak
a5fb762b03 Revert "Remove org.apache.http.legacy from bootclasspath"
This reverts commit fa7f2ad5b3.

Reason for revert: b/72084844

Change-Id: Ib89fee567f66a0cdf270a0b41e39d38d295ab7e0
2018-01-17 17:12:46 +00:00
Yifan Hong
238c6ba8fe add <vendor-ndk> to VINTF.
Test: libvintf_test
Test: vintf_object_test
Test: build and verify that <vendor-ndk> tags
are in framework manifest and device compatibility
matrix.

Fixes: 36400653

Change-Id: I4d44bff81fecc8fd2f7ab8e15770544b7b85aef9
2018-01-16 21:49:52 +00:00
Paul Duffin
fa7f2ad5b3 Remove org.apache.http.legacy from bootclasspath
Bug: 18027885
Test: build, flash and cts/tests/signature/runSignatureTests.sh
Change-Id: I4a2be98c8eb54795453e332efbd45b060ef98f82
2018-01-13 09:41:29 +00:00
Yifan Hong
64b824d3c1 Merge "framework_cm.xml: move to hardware/interfaces" am: 1e7ab9db8f am: 32faacadf0
am: 1017eaa38c

Change-Id: I17fdf26b20fcaad58f5d6170e59450d23ae92804
2018-01-11 19:28:38 +00:00
Yifan Hong
1017eaa38c Merge "framework_cm.xml: move to hardware/interfaces" am: 1e7ab9db8f
am: 32faacadf0

Change-Id: I7f3e2ea415982411c17b7cb87295b6fe70df6365
2018-01-11 19:23:57 +00:00
Yifan Hong
1e7ab9db8f Merge "framework_cm.xml: move to hardware/interfaces" 2018-01-11 19:14:24 +00:00
Nicolas Geoffray
11f9f96913 Merge "Remove copy/paste code." am: 08e7159672 am: 0cd49dcaf2
am: a66c727b7b

Change-Id: Ib476e253efdb2544b70cc4693d8428518438d989
2018-01-11 09:29:24 +00:00
Nicolas Geoffray
a66c727b7b Merge "Remove copy/paste code." am: 08e7159672
am: 0cd49dcaf2

Change-Id: I5a8911c30a563f6a49880ae79790e30d1b161c04
2018-01-11 09:26:14 +00:00
Nicolas Geoffray
08e7159672 Merge "Remove copy/paste code." 2018-01-11 09:20:05 +00:00
Mukesh Agrawal
d32c81b068 Merge "Revert "Split wifi component out of basic makefiles."" 2018-01-11 06:10:56 +00:00
Yifan Hong
919dcf1b6e framework_cm.xml: move to hardware/interfaces
Test: m dist
Bug: 69636193

Change-Id: Ic15a445d700552cb0973d6919ed5843bdecba363
2018-01-10 16:32:04 -08:00
Tri Vo
2d3e61c848 Merge "bootanim: remove access to vendor_file type" am: e320da7dce am: 43f0f6d197
am: 654b55305f

Change-Id: Ib37f765824760864c63a445926a5fa2dab7f077e
2018-01-10 22:55:53 +00:00
Tri Vo
654b55305f Merge "bootanim: remove access to vendor_file type" am: e320da7dce
am: 43f0f6d197

Change-Id: I72b888f6a3fab6a65ee4b6c5a71026d571073f71
2018-01-10 22:44:40 +00:00
Mukesh Agrawal
6fb9e807ba Revert "Split wifi component out of basic makefiles."
This reverts commit b5f1a63b5c.

Change-Id: I363f55180dd50252b72c8aa439048cfcc8c6c828
2018-01-10 22:42:16 +00:00
Tri Vo
c727d6d40e bootanim: remove access to vendor_file type
This domain should instead depend on same_process_hal_file, to which all
domains already have access.

Bug: 70990973
Test: emulator -gpu guest; boots with no denials from bootanim.
Change-Id: Ic577dd3c3895f8471d68a0da245d37a17cd6a3f3
2018-01-10 09:13:44 -08:00
Nicolas Geoffray
b7c5e3bbb9 Remove copy/paste code.
The options passed are already the default.

This is also to reduce the difference between user and userdebug
related to dexopt.

Test: m
Change-Id: Id62c38f145909b511761b471160028915000fc23
2018-01-10 10:01:11 +00:00
Dan Willemsen
3a8af7b92b Merge "Remove armv5te" am: 139f458ced am: 1211033f98
am: 179982709b

Change-Id: I5ddaada37528d635af9fbb3c585f0ea404529b22
2018-01-09 05:30:19 +00:00
Dan Willemsen
179982709b Merge "Remove armv5te" am: 139f458ced
am: 1211033f98

Change-Id: I831c073913e0ba75882130fd6d81e1c786e3af75
2018-01-09 05:09:26 +00:00
Dan Willemsen
dd3a27394f Remove armv5te
This architecture only existed for unbundled use, but even the NDK is
removing support in their r17 release, so just remove support for it.

Test: build/soong/build_test.bash -only-config
Test: check buildserver configs, I don't see anything still using armv5
Change-Id: Ic183b510c9ada94438bd4cc2b9362fa438a29ced
2018-01-08 15:26:16 -08:00
TreeHugger Robot
1d450317e7 Merge "Split wifi component out of basic makefiles." 2018-01-08 23:02:32 +00:00
SzuWei Lin
2a1e87c92a Merge "Correct some GSI settings to board makefile" am: b2e9b2b34f
am: c32a3396a9

Change-Id: Id008f877e63bf77192396f706b27c291b5c48cab
2018-01-05 08:26:34 +00:00
Treehugger Robot
b2e9b2b34f Merge "Correct some GSI settings to board makefile" 2018-01-05 08:17:44 +00:00
TreeHugger Robot
0b54d84ec0 Merge "configstore: remove configstore 1.1" 2018-01-05 06:02:44 +00:00
TreeHugger Robot
56c0c36ca4 Merge changes I511fbc48,I84ebd8f2
* changes:
  Correct some GSI settings to board makefile
  Add a default apn-conf.xml into GSI
2018-01-05 02:30:29 +00:00
Jae Shin
df0ca38484 Merge changes Ida449978,I8c6953f1 am: 8b759c08ca am: 6d5a2d54ff
am: 1e9b97e595

Change-Id: Ia3a7e7cd5319321bc97f482e9f0d0e2ad887666e
2018-01-05 01:36:44 +00:00
Jae Shin
1e9b97e595 Merge changes Ida449978,I8c6953f1 am: 8b759c08ca
am: 6d5a2d54ff

Change-Id: Ic7606d7572e7143324a210d56ce641f038d6b815
2018-01-05 01:31:12 +00:00
Jae Shin
8b759c08ca Merge changes Ida449978,I8c6953f1
* changes:
  Apply snapshot variant to vndk package module name
  Additionally package TARGET_2ND_ARCH variants
2018-01-05 01:16:06 +00:00
Garfield Tan
b5f1a63b5c Split wifi component out of basic makefiles.
ARC++ doesn't need wifi service in Android.

Test: sailfish-userdebug boots. Wifi works well.
Bug: 64160042
Change-Id: Ifcd9f9eff7f3c5ecf56cb02591107f745548c5dc
2018-01-04 14:19:19 -08:00
Jiyong Park
df4c54f894 Merge "Don't install unnecessary VNDK libs" am: 9e8b5892e4 am: 9c95b363cd
am: e45c62ecac

Change-Id: I6e1033e6956ad0c799ea4528e854084558576fcc
2018-01-04 16:30:34 +00:00
Jiyong Park
e45c62ecac Merge "Don't install unnecessary VNDK libs" am: 9e8b5892e4
am: 9c95b363cd

Change-Id: I6d4e96f5ef067d3928a3f3a943f055096ea52aa0
2018-01-04 16:27:02 +00:00
Treehugger Robot
9e8b5892e4 Merge "Don't install unnecessary VNDK libs" 2018-01-04 16:14:52 +00:00
Sundong Ahn
9ccb651066 configstore: remove configstore 1.1
Configstore was up-revisioned from 1.0 to 1.1. However no new
APIs were added to 1.1. Therefore configstore in master will be down
revisioned to 1.0.

Bug: 71555815
Test: build & boot test on taimen
Change-Id: Id7679158054468825d6f5f265ae96ac223beb3c8
2018-01-04 15:16:45 +09:00
SzuWei Lin
43672c0fc5 Normalize the 2nd CPU architect of 64 bits arm GSI
In order to let GSI more generic. Normalize the 64 bits arm GSI
to be:

    TARGET_2ND_ARCH_VARIANT := armv8-a
    TARGET_2ND_CPU_VARIANT := generic

Bug: 64775084
Test: Build pass and boot to home screen
Change-Id: I1dd5aa8524c1d243f832372bf7e3e64fae09e945
Merged-In: I1dd5aa8524c1d243f832372bf7e3e64fae09e945
2018-01-04 11:07:29 +08:00
Jae Shin
240d97a249 Apply snapshot variant to vndk package module name
VNDK snapshot phony package, vndk_v$VER, is redefined to
separate phony packages per VNDK snapshot build variant,
vndk_v$VER_$VARIANT, where $VARIANT is defined as the primary
$TARGET_ARCH of the build target.

Accordingly, top level Android.bp file under prebuilts/vndk/v$VER
is redefined as separate Android.bp files for each snapshot
variant at prebuilts/vndk/v$VER/$VARIANT/Android.bp.

Test: m -j PRODUCT_EXTRA_VNDK_VERSIONS=27 (after installing
snapshot to prebuilts/vndk/v27)
Bug: 71370248

Change-Id: Ida449978090fe8a4f16376c991d34fa0945be596
2018-01-04 10:23:19 +09:00
TreeHugger Robot
f3872366bd Merge "Adds statsd to all builds." 2017-12-27 22:17:21 +00:00
SzuWei Lin
8d0ca8df5b Correct some GSI settings to board makefile
Some setting currently in target/product/treble_common.mk, but
they should be board config variables. So, move them to
target/board/treble_common.mk.

Bug: 70951849
Test: Build pass and check on a Pixel device with GSI
Change-Id: I511fbc481583555182dab76503e67c5f56efa8eb
2017-12-26 12:07:48 +08:00
SzuWei Lin
9cec456e4f Add a default apn-conf.xml into GSI
Add a default apn-conf.xml for telephony data network, then some
devices, ex. emulator, could use the default setting when it's
system image overrided by GSI.

Bug: 69869274
Test: build pass and boot a Pixel device with GSI to home screen
Change-Id: I84ebd8f2d97471edb4f16002c3eb0e04a711da56
2017-12-26 12:07:06 +08:00
SzuWei Lin
83890eb262 Correct some GSI settings to board makefile
Some setting currently in target/product/treble_common.mk, but
they should be board config variables. So, move them to
target/board/treble_common.mk.

Bug: 70951849
Test: Build pass and check on a Pixel device with GSI
Change-Id: I511fbc481583555182dab76503e67c5f56efa8eb
Merged-In: I511fbc481583555182dab76503e67c5f56efa8eb
2017-12-26 03:36:33 +00:00
Steven Moreland
ed48e5954a Merge "Allow devices to extend the system manifest." am: 15820578b2 am: 152a886de3
am: aac4256fd2

Change-Id: I8c42fd4b758466032cec45a762b079979d0f4fa6
2017-12-23 01:28:37 +00:00
Steven Moreland
aac4256fd2 Merge "Allow devices to extend the system manifest." am: 15820578b2
am: 152a886de3

Change-Id: Id9c2f1be2b56c17fb8417a452b42bb98b4aa7b24
2017-12-23 01:25:37 +00:00
Treehugger Robot
15820578b2 Merge "Allow devices to extend the system manifest." 2017-12-23 01:17:24 +00:00
Justin Yun
4b30958555 Merge "Use current VNDK directories if version is not set on GSI" am: a5af4d920f am: cc3924fd67
am: 72a9d21cb9

Change-Id: I155f4ac421a71e481289f17bdd8236ca442307b0
2017-12-23 00:47:33 +00:00
Justin Yun
72a9d21cb9 Merge "Use current VNDK directories if version is not set on GSI" am: a5af4d920f
am: cc3924fd67

Change-Id: I43850b8c451b9001a4046406fc79b2de6506d295
2017-12-23 00:43:58 +00:00
Justin Yun
c104764f73 Use current VNDK directories if version is not set on GSI
Only for GSI, if "ro.vndk.version" property is not defined, the
vendor modules will use current version of VNDK libs.

Bug: 70704112
Test: On Android-P sailfish device, install GSI and check boot
Change-Id: Ib8eb28604ab3e33474179dffbc07358921e7439c
2017-12-23 08:16:59 +09:00
Steven Moreland
b14b530f82 Allow devices to extend the system manifest.
Introduces DEVICE_FRAMEWORK_MANIFEST_FILE, a list
of files which are added to system/manifest.xml.
This is required for devices to properly display
what hals they implement and also therefore for
them to pass vts_treble_vintf_test since it
now tests manifests based on hal origin.

Notice, this is named singularly to match
DEVICE_MANIFEST_FILE which is also a list of files.
They may be better both named "FILES", but for
consistency and legacy reasons, they can be thought
of as "everything that composes the X manifest
file".

Fixes: 70042049
Test: add system manifest extension which needs it
  and it no longer fails vts_treble_vintf_test for
  hals being served from the wrong partitions.

Change-Id: I1f59d5c3cadb7a7d4576b73196ca7b41103a49c5
2017-12-22 14:02:11 -08:00
Suren Baghdasaryan
df1006484d Go: Add defaults for downgrade_pressure and kill_heaviest_task
Explicitly define ro.lmk.downgrade_pressure and ro.lmk.kill_heaviest_task
values for Go so that defaults can be safely changed if needed.

Change-Id: I86d9c7aa52c213c43a25b02844e054dc28a6e512
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2017-12-22 13:32:35 -08:00
David Chen
c1f2d7ac67 Adds statsd to all builds.
Since incidentd requires statsd to detect anomalies, we should put
statsd on every device where incidentd is present.

Test: Test that build works as expected.
Change-Id: I64a6da15aae6cb7020cbbd0610c231547e43d645
2017-12-21 16:24:10 -08:00
Jiyong Park
4cdafdeb6b Don't install unnecessary VNDK libs
vndk_package is a phony module that includes ALL VNDK libs found in the
source code. As a result, VNDK libs that were actually not needed for
the device have been installed consuming storage. For example,
/system/lib/vndk/android.hardware.automotive*.so files were installed
even though walleye/taimen do not have automotive HALs.

VNDK libs are now installed by their link time dependencies (i.e. if a
vendor module uses libcutils, then /system/lib[64]/vndk-sp/libcutils.so
is automatically installed.).

By the way, there is a few number of VNDK libs that do not have any
link time dependency from vendor modules. They are always opened via
dlopen. In such cases, the vndk modules are added to `required`
or `LOCAL_REQUIRED_MODULES` of the module that dlopens them. Or, they
are directly added to PRODUCT_PACKAGES of the base products so that they
are always installed.

Bug: 67002788
Test: walleye builds and boots to the UI
Test: basic functionalities work (sound, camera, camcorder, slow-mo,
youtube, wifi, bluetooth)

Change-Id: I0eb36701858cd456ccb69dd0cf0a1880773675c7
2017-12-22 00:32:50 +09:00
Isaac Chen
a294e32960 Merge "Use proper make variable for vendor directory" into oc-mr1-dev-plus-aosp
am: d82319aa41

Change-Id: Ic814d282577bb538fba99a473987877ee00f093b
2017-12-21 07:13:15 +00:00
Justin Yun
c68c9a89f6 Merge "Do not enforce VNDK on GSI if VNDK version is not set" am: 98acb09033 am: 9cd647af0c
am: 9b64392eb6

Change-Id: I0951744860207f061f2869c07a89877c458d9307
2017-12-21 07:10:26 +00:00
Isaac Chen
d82319aa41 Merge "Use proper make variable for vendor directory" into oc-mr1-dev-plus-aosp 2017-12-21 04:25:56 +00:00
Justin Yun
9b64392eb6 Merge "Do not enforce VNDK on GSI if VNDK version is not set" am: 98acb09033
am: 9cd647af0c

Change-Id: I245bbe8e7a16deb42b84599691e581c504d4615c
2017-12-21 03:01:19 +00:00
Justin Yun
fc951ff268 Do not enforce VNDK on GSI if VNDK version is not set
If ro.vndk.version is not defined, use the namespace configuration
file that does not enforce VNDK restriction.
This is only for GSI.

Bug: 70704112
Test: Flash sailfish with PI and test with PI GSI image
Change-Id: Ic2b41357905ef47a3483b2eff635e8ae239e28aa
2017-12-21 08:24:36 +09:00
Isaac Chen
d7a6300c94 Use proper make variable for vendor directory
Usually, we use $(TARGET_COPY_OUT_VENDOR) in make file to refer to
the vendor directory on the device.

In target/product/emulator.mk on AOSP, this make variable is used,
but in internal master, "vendor" is used! This would cause some
automerger conflict when new CLs are commited to AOSP.

Test: $ lunch aosp_x86-userdebug; m -j; emulator
Change-Id: I18667ac76d0ba3000aa361051d02e4cbb62a4f2f
2017-12-18 18:42:05 +08:00
Bo Hu
3c3992fbb3 Merge "emulator: disable location service" am: d9ee7467fd
am: 02ade23601

Change-Id: Ida38d9bc82d6e61cc3bc6db5550bfb084012ccfd
2017-12-15 19:26:08 +00:00
Bo Hu
d9ee7467fd Merge "emulator: disable location service" 2017-12-15 19:14:20 +00:00
Yifan Hong
23373452d4 Merge changes from topic "fcm_version" am: b1b5a0969b
am: 5ac5e6b757

Change-Id: I5e11aa05336756b2756cb19ae8fec94ca696c2c9
2017-12-15 19:13:04 +00:00
Yifan Hong
f663d1ca4d Merge "Rename VINTF XML module names" am: d8d276c5a6 am: fcdf772f67
am: d2c5a38dcb

Change-Id: I330b9c4aa322cf27ba4645c3d9a57859cb5f8ae8
2017-12-15 19:00:02 +00:00
Yifan Hong
b1b5a0969b Merge changes from topic "fcm_version"
* changes:
  Move fwk comp mat level logic into assemble_vintf
  PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
2017-12-15 18:58:34 +00:00
Yifan Hong
d2c5a38dcb Merge "Rename VINTF XML module names" am: d8d276c5a6
am: fcdf772f67

Change-Id: Ic16692b74336cf7019b022b83c88921c756a0fe7
2017-12-15 18:57:28 +00:00
Yifan Hong
43ec6ead28 Rename VINTF XML module names
* system_compatibility_matrix/manifest.xml
   => framework_...
* compatibility_matrix/manifest.xml
   => device_...

This is to follow the naming scheme in VINTF
doc.

Test: build all four targets

Change-Id: If5f6a99ded9964f3500c8e5fb97278f8fd0de387
2017-12-14 18:19:44 -08:00
Yifan Hong
ed42caf94d Move fwk comp mat level logic into assemble_vintf
Deprecation schedule requirements is specified in assemble_vintf.
Move all checking logic to assemble_vintf.

Test: builds

Bug: 69636193
Change-Id: I2d62555633494014dc0005931de6c8ae9e6877fa
Merged-In: I2d62555633494014dc0005931de6c8ae9e6877fa
2017-12-14 15:35:15 -08:00
bohu
680ab2effb emulator: disable location service
So that watchdog does not reboot the
system because location service is not
responding.

This is just to get emulator images
booting on aosp.

BUG: 70378659
Change-Id: I81277208e6b9f92bb56c11b072a1f108ea964bb7
Merged-In: I81277208e6b9f92bb56c11b072a1f108ea964bb7
2017-12-14 17:09:18 +00:00
bohu
c8c807062d emulator: disable location service
So that watchdog does not reboot the
system because location service is not
responding.

This is just to get emulator images
booting on aosp.

BUG: 70378659
Change-Id: I81277208e6b9f92bb56c11b072a1f108ea964bb7
2017-12-14 09:08:42 -08:00
Yifan Hong
86f57bd9f2 Merge changes from topic "fcm_version"
* changes:
  Move fwk comp mat level logic into assemble_vintf
  PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
2017-12-14 01:26:58 +00:00
TreeHugger Robot
e1e61bc501 Merge "emulator: add wifi permission to emulator image" 2017-12-13 21:52:49 +00:00
Yifan Hong
a7443c3bbb Move fwk comp mat level logic into assemble_vintf
Deprecation schedule requirements is specified in assemble_vintf.
Move all checking logic to assemble_vintf.

Test: builds

Bug: 69636193
Change-Id: I2d62555633494014dc0005931de6c8ae9e6877fa
2017-12-13 12:16:17 -08:00
bohu
659104968f emulator: add wifi permission to emulator image
Right now, emulator does not have wifi support yet
but the wifi service is needed for the whole systemui
to not crash on internal master.

We have plan to enable wifi on emulator, and before
that we still want a bootable emulator image for
testing purpose.

Change-Id: I5fe2613d3678aa898b5f8ddf7875ab85dbd43314
2017-12-13 10:41:20 -08:00
Colin Cross
426ecd0f60 Merge "Replace build/tools with build/make/tools" am: 973301af79 am: e6dc6b2026
am: eb6c8444a6

Change-Id: I14d033658d219e81790ab1e730b7e477c70f4a13
2017-12-13 03:03:47 +00:00
Justin Yun
1a029f0da2 Merge "Define PLATFORM_VNDK_VERSION" am: 553de17d44 am: db00ea991d
am: ea0752140f

Change-Id: Ib0ecca7c0b324e65e8a9312423eef4deb2a6b3f5
2017-12-13 02:59:41 +00:00
Colin Cross
eb6c8444a6 Merge "Replace build/tools with build/make/tools" am: 973301af79
am: e6dc6b2026

Change-Id: Ie3eb9e2b411603f95f91cac79ebe56eb78423da3
2017-12-13 02:49:40 +00:00
Justin Yun
ea0752140f Merge "Define PLATFORM_VNDK_VERSION" am: 553de17d44
am: db00ea991d

Change-Id: I351f15cc9ab934a9da95b24acb8e80410c5e93d2
2017-12-13 02:35:23 +00:00
Treehugger Robot
973301af79 Merge "Replace build/tools with build/make/tools" 2017-12-13 02:34:42 +00:00
Justin Yun
2a233b3b86 Define PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION means the VNDK version that current build
provides. This value will be set to PLATFORM_SDK_VERSION once the
version is release. Otherwise, it will be set to "current".

Bug: 69883025
Test: device boot
Change-Id: I3fde4943aa062d9d148a3d7fc2798948870a48c6
2017-12-13 10:48:34 +09:00
SzuWei Lin
7494beccb3 Merge changes I8f20db07,Id3a8dd20,I0275a5d4 am: 6553fd6cad
am: 90cb321f88

Change-Id: I6df8c64d5fb0176b09e77eed0f90f569586814d5
2017-12-12 05:02:32 +00:00
Treehugger Robot
6553fd6cad Merge changes I8f20db07,Id3a8dd20,I0275a5d4
* changes:
  Enable VNDK runtime checking
  Add vintf into GSI
  Add a default apn-conf.xml into GSI
2017-12-12 04:50:26 +00:00
Isaac Chen
18c29a2ffb Merge "Enable VNDK for aosp_x86 and aosp_x86_64" am: 966e080ade
am: d3d7c2e180

Change-Id: I6699688bda4ed7d7b057c7a423c8622dc5065309
2017-12-12 04:35:15 +00:00
SzuWei Lin
596c026fd6 Enable VNDK runtime checking
GSI enabled "BOARD_VNDK_VERSION := current" on O-MR1,
but disabled VNDK runtime checking. This patch enables the checking

Bug: 69393797
Test: Build pass and boot to home screen on a Pixel device with GSI
Change-Id: I8f20db0798a07e63c453a9fe64638b99b41cd166
Merged-In: I8f20db0798a07e63c453a9fe64638b99b41cd166
(cherry picked from commit 7323f1d4ec)
2017-12-11 02:05:50 +00:00
SzuWei Lin
5cde531adb Add vintf into GSI
Bug: 70248004
Test: build pass and check the file in system image
Change-Id: Id3a8dd20e3de5dbba9d6ec222b32fed8817d300b
2017-12-08 11:07:35 +08:00
SzuWei Lin
f786f03656 Add a default apn-conf.xml into GSI
Add a default apn-conf.xml for telephony data network, then some
devices, ex. emulator, could use the default setting when it's
system image overrided by GSI.

Bug: 69869274
Test: build pass and boot a Pixel device with GSI to home screen
Change-Id: I0275a5d420eadcbb2f744e995c9a72a1fb46b935
2017-12-08 10:54:43 +08:00
Isaac Chen
d9fed02138 Enable VNDK for aosp_x86 and aosp_x86_64
When VNDK version is not enabled, libminijail.so are built under
system directory. It is not found in GSI, though.

Enable VNDK version causes it to be built under vendor directory.

Bug: 69395141
Test: Both of the following 2 products can boot to home screen.
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I6356ffe4a806b3d8fc79057bf772d139209a5f11
Merged-In: I6356ffe4a806b3d8fc79057bf772d139209a5f11
(cherry picked from commit 532d5adf7b)
2017-12-07 15:03:25 +08:00
Colin Cross
fdea893833 Replace build/tools with build/make/tools
Test: m checkbuild
Change-Id: I8db6c27a6d2372f142d10568fe92d6f2e9a59252
2017-12-06 16:12:40 -08:00
Frank Salim
e9dd9fd507 Merge "Add software-only "strongbox" KM4 to goldfish." 2017-12-06 01:16:19 +00:00
Bo Hu
d68768aa41 Merge "emulator: allows goldfish to disable bootanimation" am: 303a5f0c2d am: e262a65a1d
am: 2076ee8eaf

Change-Id: Ida8fe806de355e64606885a50b5078367f446711
2017-12-05 22:15:16 +00:00
Bo Hu
2076ee8eaf Merge "emulator: allows goldfish to disable bootanimation" am: 303a5f0c2d
am: e262a65a1d

Change-Id: Ib7e8064b3aca27c6324d002784270d015c07b9ac
2017-12-05 22:09:04 +00:00
Bo Hu
e262a65a1d Merge "emulator: allows goldfish to disable bootanimation"
am: 303a5f0c2d

Change-Id: I153a54fca751889aac73ffd54fd9197188599596
2017-12-05 22:03:55 +00:00
Frank Salim
5c2b64540c Add software-only "strongbox" KM4 to goldfish.
Test: (manual) emulator boots, strongbox KM4 can start
Change-Id: I3dfb42d57c8b932954ca7c92443222e2c10ca6a4
2017-12-05 13:12:38 -08:00
bohu
7b46d578e7 emulator: allows goldfish to disable bootanimation
[    2.447332] type=1400 audit(1512424670.440:8): avc: denied { write } for pid=1408 comm="setprop" name="property_service" dev="tmpfs" ino=1216 scontext=u:r:goldfish_setup:s0 tcontext=u:object_r:property_socket:s0 tclass=sock_file permissive=0
[    2.455350] init: Created socket '/dev/socket/adbd', mode 660, user 1000, group 1000
console:/ $ [    2.470594] init: Service 'ranchu-setup' (pid 1387) killed by signal 1

BUG: 70176291

Change-Id: I309ff3cb89ec01673e84fb275fe795f95711edd6
2017-12-05 09:10:16 -08:00
Isaac Chen
91f2d409c7 Merge "Enable VNDK for aosp_x86 and aosp_x86_64" 2017-12-05 04:28:48 +00:00
Justin Yun
709e4cf5b7 Merge "Check conformity of VNDK version" am: 6125d749ab am: cb8136d054
am: f4560ebb41

Change-Id: I43ba6de3e4eb87bae2d38b2c5613066f5d6d3d5e
2017-12-05 02:00:09 +00:00
Justin Yun
f4560ebb41 Merge "Check conformity of VNDK version" am: 6125d749ab
am: cb8136d054

Change-Id: I4ca79f1e567d07da2b999e13a0e54070b61e2a1e
2017-12-05 01:47:43 +00:00
Justin Yun
cb8136d054 Merge "Check conformity of VNDK version"
am: 6125d749ab

Change-Id: I9e4ded0975e6ba8d44658e40a59ed34a88a18c14
2017-12-05 01:38:18 +00:00
Justin Yun
9272ef87a6 Check conformity of VNDK version
Allow BOARD_VNDK_VERSION=<version> only if the prebuilt VNDK for
the <version> is provided.

If PRODUCT_EXTRA_VNDK_VERSIONS is set, all the versions in the list
will be checked as well.

Bug: 38304393
Bug: 65377115
Bug: 68123344
Test: Set BOARD_VNDK_VERSION := current and check build
Test: Set PRODUCT_EXTRA_VNDK_VERSIONS := 27 and check if it returns
      error when prebuilts/vndk/v27/Android.mk is not provided

Change-Id: I2e43d71f1ea3717ab8c45de84c926ecc43193307
2017-12-05 10:23:44 +09:00
Bo Hu
d78a7ceb7f Merge "emulator: api 26 fix guest rendering (build)" am: fb46f47085
am: c6e1046dfb

Change-Id: I5dcd84170c6f9ac7be5ef155263bfae10de93b6e
2017-12-01 20:35:40 +00:00
Bo Hu
c6e1046dfb Merge "emulator: api 26 fix guest rendering (build)"
am: fb46f47085

Change-Id: Ifb7faacf00ce8af275868869e324fe25e9e9c64a
2017-12-01 20:27:37 +00:00
Lingfeng Yang
8bed4d0ce6 emulator: api 26 fix guest rendering (build)
As swiftshader is open sourced, put it into emulator
targets to enable -gpu guest option.

Test: build aosp_x86-eng, launch emulator -gpu guest
and it should boot to home screen.

Change-Id: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
Merged-In: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
2017-12-01 08:57:53 -08:00