Commit graph

3178 commits

Author SHA1 Message Date
SzuWei Lin
95ddc40d53 Disable adb authorization in GSI
To support test automation, disable adb authorization in GSI.

Applied the patch, and device won't ask for adb authorization after
overriding system image with GSI.

Bug: 64489353
Test: boot up with GSI, and check by 'adb devices'
Change-Id: Ibaa3aaa90a89ae03b8b23abf37f53ede64d15789
2017-09-01 12:00:09 +08:00
Bo Hu
35149ca0b7 Merge changes from topic "aosp-emulator-oc"
* changes:
  emulator: fix widevine drm vndbinder denial
  emulator: fix selinux issues
  emulator: squash misc modifications from oc-emu-dev
  emualtor: keep libopenjdkjvmti*.so on sdk images
  emulator: move rild.libpath to vendor
  sdk:enable emulator to launch in build environment
  build-emulator: fully treblize emulator image
  Build vendor image for emulator
2017-08-31 22:56:31 +00:00
Lev Rumyantsev
47c84825c1 Merge "Move default native bridge value to build.prop" am: e7a0516835 am: 77492a72a2
am: 76e2b22796

Change-Id: Id41033af929bbdd8c9bab4b8f24debaeb502cc1a
2017-08-31 22:34:28 +00:00
Lev Rumyantsev
77492a72a2 Merge "Move default native bridge value to build.prop"
am: e7a0516835

Change-Id: I34f92daf8fade009b524505e51d162a78d205ac3
2017-08-31 22:16:56 +00:00
Lev Rumyantsev
be80acfd1a Move default native bridge value to build.prop
Before this change it was part of default.prop, which is applied
before init.rc is executed, so that scripts cannot override the property.

In contrast, build.prop is applied at "init-late" stage,
so that one has a chance to override the property in scripts using
"init" or "init-early" triggers.

(cherry-picked from 74b2da9db67f5da2195c9b07dab22c868934e396)

Test: fugu still works
Bug: 63133475
Merged-In: I0842abaaec1d353ebe4debda6dfe3e2c42146786
Change-Id: I0842abaaec1d353ebe4debda6dfe3e2c42146786
2017-08-31 12:13:37 -07:00
bohu
dc745a9090 emulator: fix widevine drm vndbinder denial
[   86.252399] type=1400 audit(1503684692.153:25): avc: denied { read write } for pid=4160 comm="android.hardwar" name="vndbinder" dev="tmpfs" ino=5163 scontext=u:r:hal_drm_widevine:s0 tcontext=u:object_r:vndbinder_device:s0 tclass=chr_file permissive=0

BUG: 64726466

Test: build sdk_gphone_x86-user target, launch it
and the above denial should be fixed.

Change-Id: Ied1268878236c42fbb0751a0f33014b332d78c32
Merged-In: Ied1268878236c42fbb0751a0f33014b332d78c32
2017-08-30 17:13:55 -07:00
bohu
913a990249 emulator: fix selinux issues
with cas/camera/drm hals

BUG: 64726466

Test: build aosp_x86-eng, boot emulator
without camera/drm hals killed by
selinux avc denials; camera can take
pictures

Change-Id: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
Merged-In: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-08-30 17:13:51 -07:00
bohu
7b5e1abacb emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-30 17:13:47 -07:00
bohu
bc43c4ec29 emulator: move rild.libpath to vendor
BUG: 62137708
Test: buld sdk_gphone_x86-user, launch
emulator make sure radio works

Change-Id: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
Merged-In: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
2017-08-30 17:13:37 -07:00
bohu
ac0273f162 sdk:enable emulator to launch in build environment
Recent changes in emulator requires advancedFeatures.ini,
encryptionkey.img and new kernels (such as 3.18) at OUT directory
so emulator can find them.

This CL set those up as part of the build process.

Change-Id: Ib3b7c4c48a22cecb44255e643402fd1c37797522
Merged-In: Ib3b7c4c48a22cecb44255e643402fd1c37797522
2017-08-30 17:13:32 -07:00
bohu
e3f4e9f025 build-emulator: fully treblize emulator image
Install emulator specific binaries and libraries
to vendor partition; update selinux; add vndk.

BUG: 37511975

Test: build user build, launch emualtor, run CTS.

Change-Id: I70f58947e98b41b195d77b4347d2efdc09348392
Merged-In: I70f58947e98b41b195d77b4347d2efdc09348392
2017-08-30 17:13:26 -07:00
Yahan Zhou
3cf7441dbe Build vendor image for emulator
BUG: 37511975

Test: lunch sdk_gphone_x86-user, make with dist option, unzip
sdk_gphone_x86-emulator-eng.xxxx.zip to system image folder, emulator
can boot

Change-Id: I75b9f0de17fece3dec5ae1662400808af321bd4d
Merged-In: I75b9f0de17fece3dec5ae1662400808af321bd4d
2017-08-30 17:13:20 -07:00
Jiyong Park
694cd435f2 Merge "Make GSI for arm64_ab more generic" into oc-mr1-dev
am: 73ba8bc61a

Change-Id: I149232baf4306f5ceed588fd74112fff709d58a7
2017-08-30 06:55:51 +00:00
TreeHugger Robot
73ba8bc61a Merge "Make GSI for arm64_ab more generic" into oc-mr1-dev 2017-08-30 06:43:28 +00:00
Mathieu Chartier
6ca93efd0e Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" into oc-mr1-dev
am: e7bda08941

Change-Id: I6d2a5f7bfabe793a53b255edab1f15ba1399601f
2017-08-29 23:22:18 +00:00
Mathieu Chartier
e7bda08941 Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" into oc-mr1-dev 2017-08-29 23:13:32 +00:00
Yifan Hong
fd8eded8f9 Merge changes from topic "kernel_config_arch"
am: 4b7cbf8395

Change-Id: Ic48088745d443c39cdea9d967412e21af2d28107
2017-08-29 18:34:48 +00:00
SzuWei Lin
ce34b695b6 Merge "Support TimeZoneRulesManagerService in GSI" into oc-mr1-dev
am: d0734551b7

Change-Id: I021d9c4e66bbc98f7bd8f0de2e714d32182663a0
2017-08-29 13:53:16 +00:00
TreeHugger Robot
d0734551b7 Merge "Support TimeZoneRulesManagerService in GSI" into oc-mr1-dev 2017-08-29 13:43:42 +00:00
Yifan Hong
f14b786414 Merge changes from topic "kernel_config_arch" into oc-mr1-dev
am: 8fa591d7e5

Change-Id: I51c0e6455748197268c588a9b9919f74dc6b70b9
2017-08-29 07:45:26 +00:00
Yifan Hong
8fa591d7e5 Merge changes from topic "kernel_config_arch" into oc-mr1-dev
* changes:
  fwk comp mat: add arch specific kernel requirements
  fwk comp mat: use a for loop for supported kernel versions
2017-08-29 07:35:47 +00:00
SzuWei Lin
b97fd4e603 Support TimeZoneRulesManagerService in GSI
System Server starts "TimeZoneRulesManagerService" if
"config_enableUpdateableTimeZoneRules" is true in config.xml.

Some projects would turn on "config_enableUpdateableTimeZoneRules"
by resource overlaying in vendor partition.

So, GSI needs to include all required modules for
TimeZoneRulesManagerService.

Bug: 65001751
Test: Build pass and boot with GSI into home screen
Change-Id: Ief929b23411c4fb85633696f47aabd0f065aab91
2017-08-29 09:59:00 +08:00
Mathieu Chartier
418258cee9 Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
Renamed WITH_DEXPREOPT_BOOT_IMG_ONLY to
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY and changed the
behavior accordingly.

Preopt system server jars since selinux prevents system server from
loading anything from /data. If we don't do this they will need to
be extracted which is not favorable for RAM usage or performance.

Test: make and flash and look at system server maps
Bug: 65122284
Bug: 62356545
Change-Id: I49f2a23337fdd2bc2e628b683d26a0c135b2aabe
2017-08-28 18:40:30 -07:00
Jiyong Park
56b73bb4be Make GSI for arm64_ab more generic
2ND CPU variant is set to generic as it already is for its non-AB
counterpart.

Bug: 65042524
Test: No regression on CTS with arm64_ab GSI
Change-Id: I513444178e663b154d6ccfae763c59a1091b163e
2017-08-29 09:51:00 +09:00
Yifan Hong
63e264d142 fwk comp mat: add arch specific kernel requirements
Test: m system_compatibility_matrix.xml -j
Bug: 64124223
Change-Id: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
Merged-In: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
2017-08-28 17:32:59 -07:00
Yifan Hong
a508b30df5 fwk comp mat: use a for loop for supported kernel versions
Test: m system_compatibility_matrix.xml -j

Bug: 64124223
Change-Id: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
Merged-In: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
2017-08-28 17:32:59 -07:00
bohu
f4290a4ef0 Merge "emulator: fix widevine drm vndbinder denial" into oc-mr1-dev
am: a998fd8147

Change-Id: Ie6ffacc25c7c98b1b9e470484f7140b94d8b9a7c
2017-08-28 23:50:31 +00:00
Sundong Ahn
3bcefd82db DO NOT MERGE: Merge commit '9440787d85a100bb182dee3e69bb1acaec65879e' into manual_merge
Change-Id: I90d30584ad4499d4e20254be2974d9de1d3883c0
2017-08-28 21:35:01 +00:00
Yifan Hong
afbb82b052 fwk comp mat: add arch specific kernel requirements
Test: m system_compatibility_matrix.xml -j
Bug: 64124223
Change-Id: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
2017-08-28 14:34:21 -07:00
Yifan Hong
0ae807dabb fwk comp mat: use a for loop for supported kernel versions
Test: m system_compatibility_matrix.xml -j

Bug: 64124223
Change-Id: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
2017-08-28 14:22:48 -07:00
TreeHugger Robot
a998fd8147 Merge "emulator: fix widevine drm vndbinder denial" into oc-mr1-dev 2017-08-28 05:38:41 +00:00
TreeHugger Robot
9440787d85 Merge "configstore: remove configstore 1.1" into oc-mr1-dev 2017-08-28 04:52:22 +00:00
SzuWei Lin
523a1cbc80 Merge "Reduce the system partition size of 32 bits GSI" into oc-mr1-dev
am: fe16a507fc

Change-Id: I5f9d529fe2d3e2c2b88b8eb0ead573ccac1443a7
2017-08-28 03:44:41 +00:00
TreeHugger Robot
fe16a507fc Merge "Reduce the system partition size of 32 bits GSI" into oc-mr1-dev 2017-08-28 03:40:09 +00:00
bohu
90da258962 emulator: fix widevine drm vndbinder denial
[   86.252399] type=1400 audit(1503684692.153:25): avc: denied { read write } for pid=4160 comm="android.hardwar" name="vndbinder" dev="tmpfs" ino=5163 scontext=u:r:hal_drm_widevine:s0 tcontext=u:object_r:vndbinder_device:s0 tclass=chr_file permissive=0

BUG: 64726466

Test: build sdk_gphone_x86-user target, launch it
and the above denial should be fixed.

Change-Id: Ied1268878236c42fbb0751a0f33014b332d78c32
2017-08-25 11:17:23 -07:00
Sundong Ahn
49f78ff231 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 mr1 will be down
revisioned to 1.0.

Bug: 64999074
Test: build & run
Change-Id: Ife60328110c6d6cb3e8024fb4a5caabc4c7c034f
2017-08-25 17:06:45 +00:00
bohu
fe07097cc1 emulator: fix selinux issues
am: 2ab3cf3c1f

Change-Id: Ibcb179ffe261589aa3aac4f9fdfcb5c726ad5cdd
2017-08-25 07:16:48 +00:00
bohu
2ab3cf3c1f emulator: fix selinux issues
with cas/camera/drm hals

BUG: 64726466

Test: build aosp_x86-eng, boot emulator
without cas/camera/drm hals killed by
selinux avc denials; camera can take
pictures

Change-Id: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-08-24 21:29:56 -07:00
Isaac Chen
6d91469c13 Merge "Revert "Revert "Build support for 32-bit armv8-a""" am: 9a888ebb51 am: 9f55141c5f
am: 26704591f3

Change-Id: If9bde7eb9afb7ef392b3bfb9fabffd5127b6543f
2017-08-25 02:24:35 +00:00
Isaac Chen
9f55141c5f Merge "Revert "Revert "Build support for 32-bit armv8-a"""
am: 9a888ebb51

Change-Id: I4f0b7b55de9a0b79d9f81f4aaa6c04ebd1e409b1
2017-08-25 02:03:26 +00:00
Isaac Chen
9a888ebb51 Merge "Revert "Revert "Build support for 32-bit armv8-a""" 2017-08-25 01:55:56 +00:00
Yifan Hong
0998353f08 Merge changes from topic "libvintf_cp"
am: 9bab2f5fa2

Change-Id: If2a7759c2d2f2596417814383a6a8aff91bceaa9
2017-08-24 19:53:47 +00:00
Yifan Hong
1aecc84239 Add <kernel> entry to fwk compat mat.
Test: builds and verify that system/compatibility_matrix.xml
      has configs filled.
Test: `vintf | tail` on marlin shows that fwk compat mat
      is compatible with runtime info.

Bug: 38324908
Change-Id: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
Merged-In: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
2017-08-24 11:28:04 -07:00
Bowgo Tsai
eb7b438994 Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
Note that this depends on a change in avbtool:
  https://android-review.googlesource.com/#/c/406374/

Bug: 38325029
Test: builds system.img, checks $OUT/system/compatibility_matrix.xml
      contains correct vbmeta-version
Change-Id: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
Merged-In: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
2017-08-24 11:28:04 -07:00
Yifan Hong
dae462bdd1 Accept multiple input files for device manifest.
Test: test with DEVICE_MANIFEST_FILE variable split
      into multiple files

Bug: 38217107
Change-Id: I1146898e4ccf0e8bac7d8541032f160476dbc148
Merged-In: I1146898e4ccf0e8bac7d8541032f160476dbc148
2017-08-24 11:28:02 -07:00
SzuWei Lin
2cf1711b9e Reduce the system partition size of 32 bits GSI
Bug: 64458958
Test: Build pass for aosp_arm_ab and aosp_x86_ab
Change-Id: I16e66b1d1a306d7706051a899bae85441d6535ea
2017-08-24 14:14:25 +08:00
Jeff Vander Stoep
90af004fa6 Merge "embedded.mk: move dependencies to sepolicy" am: d6c7681d85 am: 1c71c880e9
am: 0ed1778038

Change-Id: I82ab77f5bdae8496742b6dd2b40270d24a4b9622
2017-08-23 22:09:09 +00:00
Jeff Vander Stoep
1c71c880e9 Merge "embedded.mk: move dependencies to sepolicy"
am: d6c7681d85

Change-Id: I23df5e25c31963e3119bd38ee1d90bb70df45e08
2017-08-23 21:58:21 +00:00
Isaac Chen
f5af850a29 Revert "Revert "Build support for 32-bit armv8-a""
This reverts commit 7de79cbeaf.

Fixed CTS build issue by adding -march=armv7-a in cts/tests/tests/os/jni/Android.mk since the library built here needs/uses instruction (swp) obsolete in ARMv8.

Bug: 64964151
Test: lunch aosp_arm64-userdebug; make -j cts
      lunch aosp_x86-userdebug; make -j cts
      lunch aosp_sailfish-userdebug; make -j cts
      lunch aosp_bullhead-userdebug; make -j cts

Change-Id: Ic3a121600da8e2a9a2d5176b9680cd18ce457959
2017-08-23 10:58:57 +00:00
Jeff Vander Stoep
f4941eb4a7 embedded.mk: move dependencies to sepolicy
Some selinux build packages are defined in embedded.mk,
others are defined in system/sepolicy/Android.mk. Move all
to sepolicy as a dependency of the phony package selinux_policy
which is defined in embedded.mk.

Test: build Marlin (Treble) and Angler (non-Treble)
Merged-In: I734c2909354349d146c6f78beb74bd990d9af30d
Change-Id: I734c2909354349d146c6f78beb74bd990d9af30d
2017-08-23 05:26:32 +00:00
Tobias Thierer
e7c468f156 Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056 am: 0d35b9fba3 am: ff4ba02d5b
am: bc9829fb3f

Change-Id: If2462f36e946ac62143ae52d0952f2bfc74f2115
2017-08-22 10:54:38 +00:00
Tobias Thierer
bc9829fb3f Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056 am: 0d35b9fba3
am: ff4ba02d5b

Change-Id: I1d112aad1ebb715fa4990db53ed1347a9e8bf11c
2017-08-22 10:48:44 +00:00
Tobias Thierer
ff4ba02d5b Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056
am: 0d35b9fba3

Change-Id: Id2ed78457ec3014812326ee34895bf705c741052
2017-08-22 10:42:35 +00:00
Tobias Thierer
0d35b9fba3 Merge "Revert "Build support for 32-bit armv8-a""
am: 1da1c6d056

Change-Id: I7a5ae22c984ffe8781998b5ae8e20aeb7516fac1
2017-08-22 10:36:35 +00:00
Tobias Thierer
1da1c6d056 Merge "Revert "Build support for 32-bit armv8-a"" 2017-08-22 10:30:29 +00:00
Tobias Thierer
7de79cbeaf Revert "Build support for 32-bit armv8-a"
This reverts commit 0daa78eef4.

Reason for revert: Broke the build for some targets (including marlin and angler).

$ make cts
build/core/combo/TARGET_linux-arm.mk:43: kryo is armv8-a.
build/core/combo/TARGET_linux-arm.mk:45: TARGET_2ND_ARCH_VARIANT, armv7-a-neon, ignored! Use armv8-a instead.
[...]
cts/tests/tests/os/jni/android_os_cts_CpuInstructions.cpp:88:20: error: instruction requires: armv7 or earlier
    asm volatile ( "swp r0, r0, [%0]" : "+r"(ptr) : : "r0" );
                   ^
<inline asm>:1:2: note: instantiated into assembly here
        swp r0, r0, [r1]
        ^

Change-Id: I65a91ed5a4461eca6646df13642a87a5c37d6c85
2017-08-21 15:03:16 +00:00
Bowgo Tsai
1f5e66c205 Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev
am: 76097d33b2

Change-Id: I9316c9cdacafb85920cb7a1ceff64c3cff27e37f
2017-08-21 01:43:23 +00:00
TreeHugger Robot
76097d33b2 Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev 2017-08-21 01:39:05 +00:00
Bowgo Tsai
2e2f6f2b75 Merge "64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select" into oc-mr1-dev
am: 35f997178a

Change-Id: I79f490a2ec637c5a60a8d019ab8e273a88a897b2
2017-08-20 05:21:39 +00:00
Isaac Chen
d9609dd5f1 Merge "Build support for 32-bit armv8-a" am: 70fe80491c am: ef1e443e14 am: 43b2504cd2
am: e5dd3915f7

Change-Id: Ib9ddb35eee30e8024b92515873b904cd0e30d89a
2017-08-19 06:25:45 +00:00
Isaac Chen
e5dd3915f7 Merge "Build support for 32-bit armv8-a" am: 70fe80491c am: ef1e443e14
am: 43b2504cd2

Change-Id: Ib2d66b827d2562dfc247fc97dc89baa960f735bf
2017-08-19 06:23:14 +00:00
Isaac Chen
43b2504cd2 Merge "Build support for 32-bit armv8-a" am: 70fe80491c
am: ef1e443e14

Change-Id: I4086a8e63dbda784686fd42fedd38dedbbac8771
2017-08-19 06:19:44 +00:00
Isaac Chen
ef1e443e14 Merge "Build support for 32-bit armv8-a"
am: 70fe80491c

Change-Id: I6b4291a893ff42eca1933b8783e342855f22917f
2017-08-19 06:16:49 +00:00
Isaac Chen
70fe80491c Merge "Build support for 32-bit armv8-a" 2017-08-19 06:10:56 +00:00
Bowgo Tsai
882c99a33b GSI: adds /odm mount point in root dir
Bug: 64700195
Test: boot A/B device with /odm
Change-Id: Ie014a052a333b2cb8d89bc43e4326be81e638dcd
2017-08-18 16:18:35 +08:00
Bowgo Tsai
cccd0b2a30 64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select
For 64-bit GSI, there are two different zygote settings:
  1. 64-bit primary, 32-bit secondary (init.zygote64_32.rc) OR
  2. 32-bit primary, 64-bit secondary (init.zygote32_64.rc)
  3. 64-bit only is currently forbidden (b/64280459#comment6)

This change adds the second setting into root dir for vendor.img to
select. The first setting already exists.

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 is removed
because the property will be put into vendor.img. i.e., it has no effect
on GSI.

Bug: 64280459
Test: build and boot device, checks init.zygote32_64.rc is in rootdir
Change-Id: I16b36018acac8cfeee7281d6f4b6c9c19467abec
2017-08-18 11:29:45 +08:00
SzuWei Lin
414d7c6ee2 Merge "Apply vndk_package to generic system image" into oc-mr1-dev
am: e6262be0d6

Change-Id: I0eecc4fe85dce729a8e9cc5d72066d4cb41f5543
2017-08-17 10:02:19 +00:00
SzuWei Lin
3cbe82df5f Apply vndk_package to generic system image
Add vndk_package into PRODUCT_PACKAGES, which includes
HAL interfaces, VNDK, VNDK-SP and LL-NDK.

vndk_package increases the total size of GSI content, so
changes the system partition size of:

* 64 bits projects to 1.5GB
* 32 bits projects to 1.0GB

Bug: 64654641
Test: build all GSI projects
Change-Id: I3c66c966eceebd63ee19f6a3de778beed0be6de5
2017-08-17 15:12:53 +08:00
SzuWei Lin
df8310bfb6 Merge "Move common 32/64 bits product settings to another files" into oc-mr1-dev
am: 1f8b6033cb

Change-Id: Ie4b0c5055e4a221c2cc1c087ca25920b3026c47f
2017-08-15 17:20:30 +00:00
TreeHugger Robot
1f8b6033cb Merge "Move common 32/64 bits product settings to another files" into oc-mr1-dev 2017-08-15 16:53:08 +00:00
TreeHugger Robot
d215d9038b Merge "Add com.android.location.provider to the system server classpath." into oc-mr1-dev 2017-08-15 10:10:24 +00:00
Nicolas Geoffray
da7c0efec1 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469 am: 30f7a02a7a am: 1fe6892e19
am: db18b88c15

Change-Id: Icba118331fd26b92edaa373d2fd7a99e5eed0b09
2017-08-15 07:54:56 +00:00
Nicolas Geoffray
db18b88c15 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469 am: 30f7a02a7a
am: 1fe6892e19

Change-Id: I6666568d1078d0d7dd9fb298dd9bf9c2911062d5
2017-08-15 07:50:55 +00:00
Nicolas Geoffray
1fe6892e19 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469
am: 30f7a02a7a

Change-Id: Ibdcba33ba9bd46f08e6c1e4410acea8bc68db61b
2017-08-15 07:44:55 +00:00
Nicolas Geoffray
30f7a02a7a Merge "Add com.android.location.provider to the system server classpath."
am: 24678e9469

Change-Id: I0ca70630d4a607feead6ab9c1feddc878e40f698
2017-08-15 07:40:39 +00:00
Nicolas Geoffray
963485ecf7 Add com.android.location.provider to the system server classpath.
bug: 64571709
Test: com.android.location.provider is speed compiled in /system

(cherry picked from commit ec5e04096b)

Change-Id: I179872125af89101bee7493f24687518cb39a0db
2017-08-15 08:33:09 +01:00
Nicolas Geoffray
24678e9469 Merge "Add com.android.location.provider to the system server classpath." 2017-08-15 07:32:10 +00:00
SzuWei Lin
2456b82419 Merge "Reduce the system partition size of generic system images" into oc-mr1-dev
am: b5b4829c45

Change-Id: Ie29f004b118bf2aa6f74b922b72ce3e65d364603
2017-08-15 01:02:00 +00:00
TreeHugger Robot
b5b4829c45 Merge "Reduce the system partition size of generic system images" into oc-mr1-dev 2017-08-15 00:49:50 +00:00
Bo Hu
22221a4f5a Merge changes from topic "port-emu-to-oc-mr1-dev" into oc-mr1-dev
am: 60df0a831c

Change-Id: I6b3976e5f96324ffa9474cd84ff94f278a9dde33
2017-08-14 18:49:42 +00:00
bohu
e81be42996 emulator: move rild.libpath to vendor
am: cb694ebb34

Change-Id: I77aea16d2e85e94d89354352a26a1695b736bb00
2017-08-14 18:49:28 +00:00
bohu
ebc7dc21b8 sdk:enable emulator to launch in build environment
am: f2e71a4353

Change-Id: Id11fb442a1df7ae2e2f7eb5685101f6e5c9d6a2b
2017-08-14 18:49:08 +00:00
bohu
54416a0d53 build-emulator: fully treblize emulator image
am: d5f90a52e7

Change-Id: I547f67c8aed8b98116451838779453c4b0304124
2017-08-14 18:48:58 +00:00
Yahan Zhou
5a4f08b459 Build vendor image for emulator
am: c61b6bd2ed

Change-Id: Ieaa190c1bd9a356f39fa72ba5cd37570d6bba233
2017-08-14 18:48:45 +00:00
Bo Hu
60df0a831c Merge changes from topic "port-emu-to-oc-mr1-dev" into oc-mr1-dev
* changes:
  emulator: squash misc modifications from oc-emu-dev
  emualtor: keep libopenjdkjvmti*.so on sdk images
  emulator: move rild.libpath to vendor
  sdk:enable emulator to launch in build environment
  build-emulator: fully treblize emulator image
  Build vendor image for emulator
2017-08-14 18:34:57 +00:00
Mathieu Chartier
92c48b9da3 Merge "Update paths for frameworks/base/config" into oc-mr1-dev
am: 3a1776a777

Change-Id: I98219d3e398c26be485887fa914060ed8f682ea2
2017-08-14 16:58:38 +00:00
Mathieu Chartier
3a1776a777 Merge "Update paths for frameworks/base/config" into oc-mr1-dev 2017-08-14 16:53:06 +00:00
SzuWei Lin
2999f29ea0 Move common 32/64 bits product settings to another files
Move the common 32/64 bits product settings from aosp_xxx.mk to

    target/product/treble_common_(32|64).mk

The original core_64_bit.mk is not match the GSI requirement,
and will be revised soon. So, clone the content of
core_64_bit.mk into treble_common_64.mk.

Bug: 64653300
Test: Build pass
Change-Id: I6154a5c4927287c703a874b5cbf6a7f0c2c3594c
2017-08-14 18:09:49 +08:00
bohu
753e9e4462 emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-13 22:32:01 -07:00
bohu
cb694ebb34 emulator: move rild.libpath to vendor
BUG: 62137708
Test: buld sdk_gphone_x86-user, launch
emulator make sure radio works

Change-Id: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
2017-08-13 22:31:45 -07:00
bohu
f2e71a4353 sdk:enable emulator to launch in build environment
Recent changes in emulator requires advancedFeatures.ini,
encryptionkey.img and new kernels (such as 3.18) at OUT directory
so emulator can find them.

This CL set those up as part of the build process.

Change-Id: Ib3b7c4c48a22cecb44255e643402fd1c37797522
2017-08-13 22:31:36 -07:00
bohu
d5f90a52e7 build-emulator: fully treblize emulator image
Install emulator specific binaries and libraries
to vendor partition; update selinux; add vndk.

BUG: 37511975

Test: build user build, launch emualtor, run CTS.

Change-Id: I70f58947e98b41b195d77b4347d2efdc09348392
2017-08-13 22:31:22 -07:00
Yahan Zhou
c61b6bd2ed Build vendor image for emulator
BUG: 37511975

Test: lunch sdk_gphone_x86-user, make with dist option, unzip
sdk_gphone_x86-emulator-eng.xxxx.zip to system image folder, emulator
can boot

Change-Id: I75b9f0de17fece3dec5ae1662400808af321bd4d
2017-08-13 22:28:58 -07:00
Bowgo Tsai
799f1cfcf3 Merge "treble_common.mk: add the vbmeta.img to disable verification" into oc-mr1-dev
am: 025d5d910b

Change-Id: Ib9680f060e7024d566f4b0c822a05ee19b8178df
2017-08-12 04:05:36 +00:00
TreeHugger Robot
025d5d910b Merge "treble_common.mk: add the vbmeta.img to disable verification" into oc-mr1-dev 2017-08-12 04:00:18 +00:00
Mathieu Chartier
37ba2d97df Update paths for frameworks/base/config
Bug: 64259751
Test: make
Change-Id: Ie159ef9f3f96d7ecd22429327a64161bd63f525b
2017-08-11 14:45:05 -07:00
Mathieu Chartier
4f3bce897b Merge "Add dirty-images-objects handling to boot image build." into oc-mr1-dev 2017-08-11 16:32:26 +00:00
Jiyong Park
4d19874e9c Merge "Phony module vndk_package is added" am: cb674cf05d am: 347310c363
am: c674a24562

Change-Id: Ie6da1725fdadce3ac1f64c4c4558e9bc0a5666d1
2017-08-11 02:26:21 +00:00
SzuWei Lin
d52d6eb333 Merge "Move common settings in BoardConfig.mk into a common makefile" into oc-mr1-dev
am: 1f6869381f

Change-Id: I34be78f55f6b567c4c9d6760cddaaa72b2b8e81a
2017-08-11 02:26:06 +00:00
Jiyong Park
c674a24562 Merge "Phony module vndk_package is added" am: cb674cf05d
am: 347310c363

Change-Id: I3915ef9a7600a91e890111b5718b783225e208f3
2017-08-11 02:22:12 +00:00
Jiyong Park
347310c363 Merge "Phony module vndk_package is added"
am: cb674cf05d

Change-Id: I9337748d3bcdb9489f0573214dbf3e9e9fe8cd9b
2017-08-11 02:17:42 +00:00
TreeHugger Robot
1f6869381f Merge "Move common settings in BoardConfig.mk into a common makefile" into oc-mr1-dev 2017-08-11 02:17:15 +00:00
Jeff Hao
4ae165c7ae Add dirty-images-objects handling to boot image build.
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

Bug: 62554875
Test: mm test-art-host

(cherry picked from commit 865d54caf2)

Change-Id: Id711ad1c2d98b12b0f55a29acca8a96834d69ede
2017-08-10 15:21:44 -07:00
Nicolas Geoffray
ec5e04096b Add com.android.location.provider to the system server classpath.
bug: 64571709
Test: com.android.location.provider is speed compiled in /system
Change-Id: I64c5d5257cffb9bc8481bd4fb78a65cb08ac993a
2017-08-10 20:30:48 +01:00
Jiyong Park
69f4bca18e Merge "Phony module vndk_package is added" into oc-mr1-dev
am: 2f8aa9e774

Change-Id: I38ccd187eb64e204c629830df2553e86a006cf2a
2017-08-10 19:11:04 +00:00
TreeHugger Robot
2f8aa9e774 Merge "Phony module vndk_package is added" into oc-mr1-dev 2017-08-10 18:56:46 +00:00
SzuWei Lin
cc1d9c35fc Reduce the system partition size of generic system images
Some device has small ROM size, so the GSI should be as small as
possible. The patch change the image sizes to be:

- 64 projects (default):    1.25GB (1280MB)
- 32 projects (default):    0.75GB  (768MB)
- ARM32 projects:                    734MB

Bug: 64458958
Test: Build all GSI projects
Change-Id: I7f7a266e48e99b0b4d5c6a84b8187b56e4482c94
2017-08-10 17:05:45 +08:00
Isaac Chen
0daa78eef4 Build support for 32-bit armv8-a
Overwrite TARGET_(2ND_)ARCH_VARIANT as armv8-a if
TARGET_(2ND_)CPU_VARIANT is set to some known armv8-a core like
cortex-a53, cortex-a73, kryo, denver64 etc.

For clang, -march is ignored if -mcpu is set to specific core so this
change doen't impact the objects built for armv7-a-neon/some_armv8_core
since it's treated as armv8-a/some_armv8_core.

Bug: 62895439
Test: Built modified aosp_arm64 with armv8-a as its TARGET_2ND_CPU_ARCH
      and generic as its TARGET_2ND_CPU_VARIANT successfully.
      "lunch hikey-userdebug; make" and verify TARGET_2ND_ARCH_VARIANT
      is overwritten.

Change-Id: If4260cf397783b5f56c4fd432615f4676429a1d3
2017-08-10 16:13:22 +08:00
SzuWei Lin
80755694f3 Move common settings in BoardConfig.mk into a common makefile
Bug: 63878637
Test: Build pass and boot into home screen with aosp_arm64_ab of GSI
Change-Id: I1b843fcccd83e2e30eba66451b10f093ccfd458f
2017-08-10 15:03:21 +08:00
SzuWei Lin
9c941ce331 Merge "Force generic system image to load dex pre-opt from system" into oc-mr1-dev
am: 1b2b437204

Change-Id: I2c5b311e1b56b923f7fcdd086d28dee97acc0d2d
2017-08-10 05:43:18 +00:00
TreeHugger Robot
1b2b437204 Merge "Force generic system image to load dex pre-opt from system" into oc-mr1-dev 2017-08-10 05:31:44 +00:00
Jiyong Park
a5535733f1 Phony module vndk_package is added
This phony module aggregates all the VNDK-related libraries so that they
can be installed to the system partition simply by adding 'vndk_package'
to PRODUCT_PACKAGES. This is to sneure that all VNDK libraries are
installed even when there is no vendor library using some of the VNDK
libs (especially when building system image only).

Bug: 64013660
Test: BOARD_VNDK_VERSION=current m -j vndk_package
Merged-In: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
Change-Id: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
2017-08-10 14:15:01 +09:00
SzuWei Lin
2a2a7a77ba Merge "Add new products aosp_x86_ab and aosp_x86_64_ab" into oc-mr1-dev
am: 76a097786c

Change-Id: I3e5db03c6eb50b7e4cd22c0ee17a6b4ff75a7e0c
2017-08-10 05:13:17 +00:00
Jiyong Park
6ea81532ea Phony module vndk_package is added
This phony module aggregates all the VNDK-related libraries so that they
can be installed to the system partition simply by adding 'vndk_package'
to PRODUCT_PACKAGES. This is to sneure that all VNDK libraries are
installed even when there is no vendor library using some of the VNDK
libs (especially when building system image only).

Bug: 64013660
Test: BOARD_VNDK_VERSION=current m -j vndk_package
Change-Id: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
2017-08-10 14:11:41 +09:00
TreeHugger Robot
76a097786c Merge "Add new products aosp_x86_ab and aosp_x86_64_ab" into oc-mr1-dev 2017-08-10 05:07:37 +00:00
SzuWei Lin
78a11ff550 Merge changes I9f956bc3,Ifad208d2,Ifb3e0235 into oc-mr1-dev
am: 0ef22fd4ae

Change-Id: Ib76d012c836970afa9157400e31f1e79dc71ed30
2017-08-10 04:52:44 +00:00
TreeHugger Robot
0ef22fd4ae Merge changes I9f956bc3,Ifad208d2,Ifb3e0235 into oc-mr1-dev
* changes:
  Add new products aosp_x86_a and aosp_x86_64_a
  Add new product aosp_arm_ab
  Share system properties with all GSI project with treble_system.prop
2017-08-10 04:46:30 +00:00
Roozbeh Pournader
3c410faa74 Enable Canadian English on L10n builds
am: e3793d947f

Change-Id: I00ab6906994456da3876db11b3232f0bda206a37
2017-08-09 22:05:07 +00:00
Roozbeh Pournader
e3793d947f Enable Canadian English on L10n builds
Bug: 64491256
Test: mmma -j packages/apps/Settings (and checking the APK using aapt dump badging)
Change-Id: I1108802a89bd82ccc6e2cc0c2464b8e30eb796b4
2017-08-09 12:08:22 -07:00
Roozbeh Pournader
f404c80369 Add en-XC (cracked pseudo-locale) to L10n build
am: c11e0eac1c

Change-Id: Ic61253e7a0258e120f483cac9fd25f6e3a4e361e
2017-08-09 18:41:32 +00:00
Mark Salyzyn
6157cf697a Merge "logcat: permit transition to Android.bp" am: 374f753211 am: 1830c9596d am: 5d9e6eb512
am: 2888bd2385

Change-Id: I559ff3733eacced71fedf5b4088dab32433dbc21
2017-08-09 00:09:03 +00:00
Roozbeh Pournader
c11e0eac1c Add en-XC (cracked pseudo-locale) to L10n build
Also sort the locales alphabetically (keeping en-US first) and move
them to separate lines.

Bug: 64394698
Test: none
Change-Id: I3aad3ce1ad9093ffe0ffdf56ebb6f287aec29d44
2017-08-09 00:05:13 +00:00
Mark Salyzyn
2888bd2385 Merge "logcat: permit transition to Android.bp" am: 374f753211 am: 1830c9596d
am: 5d9e6eb512

Change-Id: I9ec6334643253c7fb07916dcaab48c82a6112d77
2017-08-08 23:31:50 +00:00
Mark Salyzyn
5d9e6eb512 Merge "logcat: permit transition to Android.bp" am: 374f753211
am: 1830c9596d

Change-Id: I0fbe9bf8f12c10ce30fddc2e1a3ed9c66b21c6ce
2017-08-08 23:16:27 +00:00
Mark Salyzyn
1830c9596d Merge "logcat: permit transition to Android.bp"
am: 374f753211

Change-Id: Ieeee905248faea638ed18831ba2168f2914f7d02
2017-08-08 23:10:03 +00:00
Treehugger Robot
374f753211 Merge "logcat: permit transition to Android.bp" 2017-08-08 23:06:25 +00:00
Mark Salyzyn
719790f4d4 logcat: permit transition to Android.bp
Permit transition of logcat to Android.bp by moving the debug
target logpersist.start to the PRODUCT_PACKAGES_DEBUG list.

Test: compile
Change-Id: I6cfd4c40f848a2ff2661e3692fa8cd69ed99e8c9
2017-08-08 14:24:55 -07:00
Todd Poynor
e2cf08e6e9 Merge "thermal: Add Thermal HAL 1.1 to treble_common.mk" into oc-mr1-dev
am: f2a63c19f3

Change-Id: I00868fe13192e7a511367e83f7280464589890ed
2017-08-08 01:22:21 +00:00
Todd Poynor
8302bc0c12 thermalserviced: add ThermalService daemon
am: 614482f09f

Change-Id: I5a40f99c49b261ba6202e74fac222f41ebd953ff
2017-08-08 01:22:14 +00:00
TreeHugger Robot
f2a63c19f3 Merge "thermal: Add Thermal HAL 1.1 to treble_common.mk" into oc-mr1-dev 2017-08-08 01:15:36 +00:00
Jeff Gaston
3fbd26c2b8 Merge "Remove the need to find Android.mk files via directory symlinks" am: 6ab53d7211 am: 03e7e81837 am: aed14c5515
am: 5b767956fd

Change-Id: Ib65d41975941cced51e5e5e37b7b3d87e93b4367
2017-08-08 00:22:22 +00:00
Jeff Gaston
5b767956fd Merge "Remove the need to find Android.mk files via directory symlinks" am: 6ab53d7211 am: 03e7e81837
am: aed14c5515

Change-Id: I84c8258ebb89eff647cdd52663f812c5600145e1
2017-08-08 00:19:21 +00:00
Jeff Gaston
aed14c5515 Merge "Remove the need to find Android.mk files via directory symlinks" am: 6ab53d7211
am: 03e7e81837

Change-Id: Ib453be719ce27c3f354b1353e45939cee2102aea
2017-08-08 00:16:53 +00:00
Jeff Gaston
03e7e81837 Merge "Remove the need to find Android.mk files via directory symlinks"
am: 6ab53d7211

Change-Id: I0495d45001821d095531d5be7c049fc2836888f7
2017-08-08 00:14:51 +00:00
Jeff Gaston
6ab53d7211 Merge "Remove the need to find Android.mk files via directory symlinks" 2017-08-08 00:05:09 +00:00
Todd Poynor
614482f09f thermalserviced: add ThermalService daemon
Add ThermalService daemon to embedded.mk as part of the minimal build
of open source parts of the tree.

Test: manual on marlin
Bug: 30982366
Change-Id: I8315a8f5871ec24d8970deaa8527ee74db1c4dc7
(cherry picked from commit d006688090)
2017-08-07 23:02:56 +00:00
Todd Poynor
6197aba946 thermal: Add Thermal HAL 1.1 to treble_common.mk
Add rev 1.1 of Thermal HAL.

Test: VtsHalThermalV1_1TargetTest; plus manual on marlin
Bug: 30982366
Change-Id: Iaaef326e5d2bad05d934614b79c7c44e7592fdc4
(cherry picked from commit ca0adce235)
2017-08-07 23:02:01 +00:00
Jeff Gaston
5c1f3fd068 Remove the need to find Android.mk files via directory symlinks
Bug: 64397960
Test: m -j
Change-Id: I5b77dd654dfced63900913c447b5448b632158d7
2017-08-07 14:21:20 -07:00
Jeff Hao
d405e38d62 Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8 am: 3b16c4e7c7 am: 5b3e24484c
am: 7e6899ac53

Change-Id: I1db95c6b937d4ef0c930739407e799383781b068
2017-08-05 01:30:20 +00:00
Jeff Hao
7e6899ac53 Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8 am: 3b16c4e7c7
am: 5b3e24484c

Change-Id: I18365f7c17ccb0b2e90dd4ecfbddaeb5843bcfde
2017-08-05 01:20:34 +00:00
Jeff Hao
5b3e24484c Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8
am: 3b16c4e7c7

Change-Id: I2786f4baa79a9842d91426a721cee80b1f039900
2017-08-05 01:13:40 +00:00
Jeff Hao
3b16c4e7c7 Merge "Add dirty-images-objects handling to boot image build."
am: 5848fedea8

Change-Id: Ida5683c28ed78db625a5383f52b81a087373ea75
2017-08-05 01:02:18 +00:00
SzuWei Lin
8b60c822ab Force generic system image to load dex pre-opt from system
Generic system image always generates dex pre-opt in system image,
to improve the time of first boot.

But the property ro.cp_system_other_odex could be defined in vendor
image, so we disable the property in generic system image to force
dex pre-opt be loaded from system image.

Bug: 62645784
Test: Test the patch on a A/B project with GSI, confirm the dex
      pre-opt is loaded from GSI.

Change-Id: I71b4a5bed517841b5f889d21d73429fa91da25ba
Merged-In: I71b4a5bed517841b5f889d21d73429fa91da25ba

(cherry picked from commit 5677b877fb)
2017-08-04 11:47:02 +08:00
Jeff Hao
b454ee195a Add dirty-images-objects handling to boot image build.
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

(cherry-picked from commit 865d54caf2)

Bug: 62554875
Test: mm test-art-host

Merged-In: I2486d2704d74a192f1ecdc02589e569b61efa4ae
Change-Id: I2486d2704d74a192f1ecdc02589e569b61efa4ae
2017-08-03 11:04:11 -07:00
Bowgo Tsai
9afc0d5349 treble_common.mk: add the vbmeta.img to disable verification
AVB should be disabled for Treble VTS. Otherwise, OEM devices cannot boot
the generic system.img provided by Google.

Bug: 64055917
Test: Compiles and boot a device with the vbmeta.img
Change-Id: I0eaae7beebc8b901d0b4766c2cdc34a27ad02b59
2017-08-02 21:15:26 +08:00
Bo Hu
e6e2566f07 Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am: 5af2027e34 am: abd33cdba6 am: 1b86b7581c
am: d80d922083

Change-Id: I7bc9ad244fe32d494a1719338711579ce2aafc4b
2017-08-01 23:34:44 +00:00
Bo Hu
d80d922083 Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am: 5af2027e34 am: abd33cdba6
am: 1b86b7581c

Change-Id: I0c8bf4c8db0cb783c7116d2f9d0734b98341401a
2017-08-01 23:30:23 +00:00
Bo Hu
1b86b7581c Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am: 5af2027e34
am: abd33cdba6

Change-Id: I4ec03f912aa03156114859432f4331f50b5d60b2
2017-08-01 23:26:17 +00:00
Bo Hu
abd33cdba6 Merge "Revert "Revert "emulator: create qemu images for system,vendor"""
am: 5af2027e34

Change-Id: I61b9598d6b69d74a42ad0dc445c866e3034ff638
2017-08-01 23:22:17 +00:00
Bo Hu
bc88ff69cf Revert "Revert "emulator: create qemu images for system,vendor""
This reverts commit 9b99ddc8a5.
and add syste-qemu.img to the dependency list of sdk target

BUG: 64235252

Test: build sdk target successfully

(cherry picked from commit f0d50bbef0)

Change-Id: I813233c7c3f06eb1eca18aad5ea890a55814eb1b
2017-08-01 14:34:15 -07:00
Bo Hu
f0d50bbef0 Revert "Revert "emulator: create qemu images for system,vendor""
This reverts commit 9b99ddc8a5.
and add syste-qemu.img to the dependency list of sdk target

Test: build sdk target successfully

Change-Id: Idb0bee56275f3bfe33ba7d29463e4b8e0699ec33
2017-08-01 13:00:53 -07:00
Bo Hu
c8aaab1f3f Merge "Revert "emulator: create qemu images for system,vendor"" am: a2ea9626e5 am: b7e5cf8b6d am: 471e2ba1d6
am: b0ca7302aa

Change-Id: Id5a4573dbaf9d2c7b3ad95592bf17edcb3264658
2017-08-01 07:10:37 +00:00
Bo Hu
b0ca7302aa Merge "Revert "emulator: create qemu images for system,vendor"" am: a2ea9626e5 am: b7e5cf8b6d
am: 471e2ba1d6

Change-Id: I89357469dfcb50f03771e733a41ea704801ce044
2017-08-01 07:07:07 +00:00
Bo Hu
471e2ba1d6 Merge "Revert "emulator: create qemu images for system,vendor"" am: a2ea9626e5
am: b7e5cf8b6d

Change-Id: I2929dae53386a287864d3166d707bfe9137a7803
2017-08-01 07:03:36 +00:00
Bo Hu
b7e5cf8b6d Merge "Revert "emulator: create qemu images for system,vendor""
am: a2ea9626e5

Change-Id: I0118d5355aa3ffcd728b22e964609f02561df2db
2017-08-01 07:00:06 +00:00
Bo Hu
9b99ddc8a5 Revert "emulator: create qemu images for system,vendor"
This reverts commit b5d0503758.

Change-Id: Ie46a3a3dd99dec42673b3e3bd5b9085ca0480a8d
2017-08-01 06:50:07 +00:00
bohu
34e0ca1577 Merge "emulator: create qemu images for system,vendor" am: 571e5d47b7 am: dbbd3311ae am: fe3b305516
am: 69121fd68c

Change-Id: Ic31e0551981bc9ee48586a1c2222817610d4500a
2017-08-01 02:18:45 +00:00
bohu
69121fd68c Merge "emulator: create qemu images for system,vendor" am: 571e5d47b7 am: dbbd3311ae
am: fe3b305516

Change-Id: I5cb77655098ff078c4677e083843e5d7e4a57f07
2017-08-01 02:12:16 +00:00
bohu
fe3b305516 Merge "emulator: create qemu images for system,vendor" am: 571e5d47b7
am: dbbd3311ae

Change-Id: I00b15a3ab05ce7d64fad7e9700169fd67ae699fb
2017-08-01 01:58:40 +00:00
bohu
dbbd3311ae Merge "emulator: create qemu images for system,vendor"
am: 571e5d47b7

Change-Id: Id80d452017384769146879bec205f39da79e37ae
2017-08-01 01:56:12 +00:00
bohu
b5d0503758 emulator: create qemu images for system,vendor
For raw system.img and vendor.img do not have
partition table and init refuses to mount them
in first stage mounting.

For emulator build:
create partitioned system-qemu.img for system.img;
create partitioned vendor-qemu.img for vendor.img
if applicable.

Change-Id: I64fdcdafc303cf2f74a1e96653e7afe259f0af98
2017-07-31 16:28:40 -07:00
Niranjan Pendharkar
6edf4c64f0 update new HIDL interfaces in generic system image am: 4584215b55
am: 98a099cbcc

Change-Id: I74db11555e464e44125216d2e558a61aa4ff09fa
2017-07-31 18:59:40 +00:00
Niranjan Pendharkar
593767a780 update new HIDL interfaces in generic system image
am: 4584215b55

Change-Id: I644f7e1a1d4ceabbccecfb54914cc723021bac3b
2017-07-31 18:56:11 +00:00
Niranjan Pendharkar
98a099cbcc update new HIDL interfaces in generic system image
am: 4584215b55

Change-Id: I400ef38998d3b28f779244e91f6b6b286516015c
2017-07-31 18:50:41 +00:00
TreeHugger Robot
d4083602cc Merge "Adds the Neural Networks lib to the base configuration." into oc-mr1-dev 2017-07-29 23:55:40 +00:00
Niranjan Pendharkar
4584215b55 update new HIDL interfaces in generic system image
Test: Boot to home screen
Bug: 36682246
Change-Id: Ia856ed0929caa0c089a62100d17f717519ae5ebf
2017-07-28 08:30:03 -07:00
SzuWei Lin
0f0cc8a17f Add new products aosp_x86_ab and aosp_x86_64_ab
The product is for GSI with x86 64-bits and 32-bits with A/B
update.

Bug: 38339398
Test: Build pass
Change-Id: I1f945a812e0fbf8c4266d2f91624c2c674941383
Merged-In: I1f945a812e0fbf8c4266d2f91624c2c674941383
(cherry picked from commit 06956fe54c)
2017-07-28 11:40:25 +08:00
SzuWei Lin
e4648214e8 Add new products aosp_x86_a and aosp_x86_64_a
The product is for GSI with x86 64-bits and 32-bits without A/B
update.

Bug: 38339837
Test: Build pass and boot to home screen on 32/64-bits x86 emulator
      by replacing system image with GSI
Change-Id: I9f956bc35ba5700900df7c2fca45bf794684a418
Merged-In: I9f956bc35ba5700900df7c2fca45bf794684a418
(cherry picked from commit 4b189c810e)
2017-07-28 11:39:56 +08:00
SzuWei Lin
e572132aa6 Add new product aosp_arm_ab
The product is for GSI with ARM 32-bits and A/B update.

Bug: 38339485
Test: Build pass
Change-Id: Ifad208d2e625f30d0a3dd964d53d81257eeefabf
Merged-In: Ifad208d2e625f30d0a3dd964d53d81257eeefabf
(cherry picked from commit fbc4835faa)
2017-07-28 11:39:40 +08:00
SzuWei Lin
9821e00caa Share system properties with all GSI project with treble_system.prop
Use TARGET_SYSTEM_PROP to assign a common system property file in each
GSI BoardConfig.mk

Bug: 62647757
Test: make and check the file system/build.prop in out folder
Change-Id: Ifb3e02356869f97573a3690a6d67c2b4a9471c46
Merged-In: Ifb3e02356869f97573a3690a6d67c2b4a9471c46
(cherry picked from commit 7e10169909)
2017-07-28 11:38:59 +08:00
Lucas Dupin
203de1108f Merge "Removed overlay from target" into oc-dr1-dev
am: eb42aa7438

Change-Id: If2720dcb6e3c376f968e454fb734f3443c5a3080
2017-07-25 23:23:03 +00:00
Lucas Dupin
2c0743601e Merge "Removed overlay from target" into oc-dr1-dev
am: eb42aa7438

Change-Id: I2880faeab223755faeca64335b0eac8fe798ec80
2017-07-25 17:48:02 +00:00
Lucas Dupin
3297613a43 Removed overlay from target
Lock screen colors won't be handled by overlays anymore.

Test: make
Bug: 63751714
Change-Id: I496575d62ab326e7bb774643fac6fcb8d6c801a1
2017-07-24 13:29:26 -07:00
Jeff Vander Stoep
9a8f6775ec sepolicy: remove all use of domain_deprecated
This attribute has been removed from public policy and is no longer
available.

Bug: 38316109
Test: build policy
Change-Id: I3407ced2d725de982e19b77345827de03d93c426
(cherry picked from commit ec488e1fee)
2017-07-24 08:17:39 -07:00
Jorim Jaggi
2145739ff4 Merge "Revert "Removed overlay from target"" into oc-dr1-dev
am: 8a7f2128b3

Change-Id: If4242cbe667e689662ba2323e986d35cf6c03f53
2017-07-24 14:13:41 +00:00
Jorim Jaggi
6aef32af4d Merge "Revert "Removed overlay from target"" into oc-dr1-dev
am: 8a7f2128b3

Change-Id: Ic108bd9ffcb6201671764d4dccdd6b460ad29f1e
2017-07-24 14:13:39 +00:00
Jorim Jaggi
8a7f2128b3 Merge "Revert "Removed overlay from target"" into oc-dr1-dev 2017-07-24 14:07:55 +00:00
Jorim Jaggi
fa794173fe Revert "Removed overlay from target"
This reverts commit fd2b1807ca.

Fixes crashloop with lock pattern

Change-Id: I6f15c18e7a10d6755ab151bb976616e753e520a3
Fixes: 63980375
2017-07-24 13:55:19 +00:00
Lucas Dupin
33d42fbb0e Merge "Removed overlay from target" into oc-dr1-dev
am: 67afad200d

Change-Id: I4d01fdbffe8dd0c61c8adb9dd4c855b99dbf8ca3
2017-07-22 04:51:03 +00:00
Lucas Dupin
10bf90f60f Merge "Removed overlay from target" into oc-dr1-dev
am: 67afad200d

Change-Id: If5a32cc9bfa3d8116b9a69403fd7484eedf5dfe8
2017-07-22 04:51:03 +00:00
TreeHugger Robot
67afad200d Merge "Removed overlay from target" into oc-dr1-dev 2017-07-22 04:46:20 +00:00
Jean-Luc Brouillet
4f612c6f36 Adds the Neural Networks lib to the base configuration.
This will ensure that the library is on all devices even
if no builtin apps uses the lib.

Bug: 63905942
Test: Ran an application that uses the NN API.
Change-Id: I52ce6142f94d21ca55fa26875fab3f4926e2c6bb
2017-07-21 20:13:14 -07:00
Pawin Vongmasa
5309a4758e Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev
am: 8fc04cc40a

Change-Id: I083c28df9d9ba1b1ce656222bc3d4196cdc8ae2e
2017-07-20 23:11:43 +00:00
Pawin Vongmasa
c194d53411 Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev
am: 8fc04cc40a

Change-Id: I841a7739d2ec7de3945b04dce1609d071287f8dc
2017-07-20 23:11:35 +00:00
TreeHugger Robot
8fc04cc40a Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev 2017-07-20 23:06:38 +00:00
Pawin Vongmasa
a910353474 Add libstagefright_soft_flacdec to core_base.mk
Test: Play test file from b/37787245
Bug: 37794552
Change-Id: Ib5e4a26b9650e92047587d2e98f992c2df57eede
2017-07-19 13:49:34 -07:00
Suren Baghdasaryan
849929256e Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release am: 81a7690eb9
am: 033c79c4fa

Change-Id: Ifd5dbfe30a524336e60d02a3f7059c234f7c399e
2017-07-19 20:47:11 +00:00
Suren Baghdasaryan
033c79c4fa Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release
am: 81a7690eb9

Change-Id: I578a54bbd403493d4ffa40c43189d443f0ef119b
2017-07-19 20:44:14 +00:00
Suren Baghdasaryan
81a7690eb9 Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release
For Android O release PRODUCT_SHIPPING_API_LEVEL is set to 26.

Change-Id: Ie1d5af375f2db95850fc5395d6a0c775dbfa046d
Merged-In: Ie1d5af375f2db95850fc5395d6a0c775dbfa046d
(cherry picked from commit f3251ac73b)
2017-07-19 19:52:20 +00:00
Shubham Ajmera
d060624916 Merge "Add compiler filter for inactive app downgrade" 2017-07-18 17:09:07 +00:00
TreeHugger Robot
447ac999c6 Merge "Remove unnecessary configs" 2017-07-18 06:26:45 +00:00
TreeHugger Robot
30bd2f7e41 Merge "Add netutils-wrapper to generic system image" 2017-07-18 02:45:58 +00:00
Lucas Dupin
fd2b1807ca Removed overlay from target
Lock screen colors won't be handled by overlays anymore.

Test: make
Bug: 63751714
Change-Id: Ia4767906cadae6b88b022e549ca099175a0e4017
2017-07-17 17:48:52 -07:00
Roshan Pius
ae8228c5bd treble_common.mk: Add wifi 1.1 package am: ec35a22d2c
am: db0c3a570b

Change-Id: Ibe63bc9500c19397cd088b09a5fe2d0d93c30dda
2017-07-17 20:16:52 +00:00
Roshan Pius
db0c3a570b treble_common.mk: Add wifi 1.1 package
am: ec35a22d2c

Change-Id: I23d907e900394e152842ab9f737b5a3ca4751c9f
2017-07-17 20:14:16 +00:00
Roshan Pius
ec35a22d2c treble_common.mk: Add wifi 1.1 package
Bug: 63129484
Test: Compiles
Change-Id: Id254722a98dbd25c7016d0902c60151b6573d335
2017-07-17 11:13:17 -07:00
SzuWei Lin
2bc960fd9f Remove unnecessary configs
BOARD_USES_VENDORIMAGE is always true if TARGET_COPY_OUT_VENDOR
is 'vendor'.

Bug: 63609670
Test: build, flash and boot to home screen
Change-Id: I719a17f27e046448180e846a6597fa2fbf3c0726
2017-07-13 17:12:03 +08:00
SzuWei Lin
599fefae6b Add netutils-wrapper to generic system image
Bug: 63370530
Test: Build and check the files in system
Change-Id: I2b0f1e10dc5f09ac0fa39ee62df999a1de5e537f
2017-07-12 16:56:43 +08:00
Yifan Hong
da8694d186 Add <kernel> entry to fwk compat mat.
Test: builds and verify that system/compatibility_matrix.xml
      has configs filled.
Test: `vintf | tail` on marlin shows that fwk compat mat
      is compatible with runtime info.

Bug: 38324908
Change-Id: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
2017-07-10 16:59:57 -07:00
Sundong Ahn
bbab8007c6 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 dr1 will be down
revisioned to 1.0.

Bug: 63440035
Test: build & run
Change-Id: Ife60328110c6d6cb3e8024fb4a5caabc4c7c034f
Merged-In: I21861448a5d607383b617f2f85bd378013e64090
2017-07-10 15:05:32 +09:00
Andreas Gampe
ce2236d92a Merge "Build: More tombstones in userdebug" am: 5378d0a7eb
am: 205958cb38

Change-Id: Ie5390a231825f31fa2c945d1bdba228266302804
2017-07-07 15:26:41 +00:00
Andreas Gampe
205958cb38 Merge "Build: More tombstones in userdebug"
am: 5378d0a7eb

Change-Id: I414a28b22f8677099ab61812995ca6715f8f2563
2017-07-07 15:23:48 +00:00
Andreas Gampe
d0d5e24d25 Build: More tombstones in userdebug am: 47e137f357
am: 0b24deb839

Change-Id: Id95c13128a215e5c0e02c7bf337c7bd28a281e6b
2017-07-07 07:00:37 +00:00
Andreas Gampe
0b24deb839 Build: More tombstones in userdebug
am: 47e137f357

Change-Id: I6dc83edb29170e1f5a3c70d823d5c3a8d0089a7e
2017-07-07 06:57:16 +00:00
Andreas Gampe
427e49e0da Build: More tombstones in userdebug
For devices using core_minimal, set the number of retained
tombstones in userdebug and eng builds to 50. This will help
with dogfooding.

(cherry picked from commit 47e137f357)

Bug: 63131375
Test: lunch bullhead_userdebug && m && fastboot flashall && adb getprop tombstoned.max_tombstone_count
Change-Id: I163d40f7a8f73df1af1228309d7a7a95511bdef9
2017-07-06 23:54:14 -07:00
Andreas Gampe
47e137f357 Build: More tombstones in userdebug
For devices using core_minimal, set the number of retained
tombstones in userdebug and eng builds to 50. This will help
with dogfooding.

Bug: 63131375
Test: lunch bullhead_userdebug && m && fastboot flashall && adb getprop tombstoned.max_tombstone_count
Change-Id: I163d40f7a8f73df1af1228309d7a7a95511bdef9
2017-07-06 21:20:54 -07:00
bohu
7b6320773a emulator: fix emulator booting
1. update rild libpath to vendor instead of system

Test: build sdk_phone_x86-eng and launch emulator
it should boot to home screen.

Change-Id: I7b9946e61de952e4b7ae89b740050b768be1cf99
2017-07-05 23:12:29 -07:00
bohu
a3e5fcd03e emulator: get emulator booting am: d665b020f2 am: 0f4de2f8aa
am: 0b737d3248

Change-Id: Ia100f2f3394a9b89acebaeeb7557a420c28ddace
2017-07-06 02:32:37 +00:00
bohu
0b737d3248 emulator: get emulator booting am: d665b020f2
am: 0f4de2f8aa

Change-Id: I5fcbc47de2c46dbc468139e95a626ad071a2e0a2
2017-07-06 02:19:53 +00:00
bohu
0f4de2f8aa emulator: get emulator booting
am: d665b020f2

Change-Id: Idf376eae7d42242f17fdef99ce0d6de9067a2236
2017-07-06 02:17:22 +00:00
bohu
e9ba09af7a emulator: get emulator booting
am: d665b020f2

Change-Id: I2d2399cca30f02b66dd243086839b35a336050bb
2017-07-06 02:17:22 +00:00
bohu
d665b020f2 emulator: get emulator booting
1. add missing hals
2. setup missing selinux
3. install manifest.xml to vendor/
4. install emulator setup scripts and setup
   selinux domain

BUG: 63268696
Test: build sdk_gphone_x86-userdebug
and launch emulator, boot to home

Change-Id: Ibacea9c761bc06736a8baa39d891d1c2ed3d74f4
2017-07-05 17:02:56 -07:00
TreeHugger Robot
ec67d4fa1c Merge "cas: add CAS hal to build" 2017-06-28 20:37:25 +00:00
SzuWei Lin
25ffd0b35d Merge "Update new HIDL interfaces in generic system image" into oc-dr1-dev am: e07c2ed19e
am: 87a643cfa1

Change-Id: Ida87aa7dde0bd0962dae4dd863575e9bca8d921d
2017-06-28 07:48:36 +00:00
SzuWei Lin
87a643cfa1 Merge "Update new HIDL interfaces in generic system image" into oc-dr1-dev
am: e07c2ed19e

Change-Id: I61cd06b0d9f5827b8c26728b2bed0647b7bab4d5
2017-06-28 07:44:37 +00:00
TreeHugger Robot
e07c2ed19e Merge "Update new HIDL interfaces in generic system image" into oc-dr1-dev 2017-06-28 07:40:58 +00:00
Bowgo Tsai
ea67794604 Removing vboot 1.0 verity metadata am: 952f6a458e
am: bd56083dcb

Change-Id: I3048aab17787f50117e62975becc68c48c3b0765
2017-06-28 06:06:00 +00:00
Bowgo Tsai
bd56083dcb Removing vboot 1.0 verity metadata
am: 952f6a458e

Change-Id: Idf363438d6855a5c783e2e037c9bc9aca64c4653
2017-06-28 06:02:00 +00:00
SzuWei Lin
7db5d2c9f3 Update new HIDL interfaces in generic system image
Bug: 63051055
Test: Boot with GSI to home screen
Change-Id: Id5783355e9fae8f48088d4a9eaaf8429425adb45
2017-06-28 09:36:36 +08:00
Shubham Ajmera
572a3df7fc Add compiler filter for inactive app downgrade
Bug: 36598475
Test: Verified the property value on the device

Change-Id: I8afcffcb7064ff6a3b97c26ee18aa22f969ffef3
2017-06-27 17:34:02 -07:00
Bowgo Tsai
952f6a458e Removing vboot 1.0 verity metadata
The generic system.img shouldn't contain any specific verity metadata
because we don't mandate how to do verified boot. Plus, OC-DR devices
use AVB instead of vboot 1.0.

Bug: 62647718
Test: Boot a DR device with the generic system.img
Change-Id: I0966d88d4512621cce7b8abdc28a90a6e312a391
2017-06-27 18:13:56 +08:00
Tomasz Wasilczyk
16c8d3d3f3 Merge "Remove previous implementation of RadioService." 2017-06-26 20:58:53 +00:00
SzuWei Lin
2967975b70 Merge "Add wificond to Android makefiles" into oc-dr1-dev am: b1cbbaf528
am: 9df6f1c5ca

Change-Id: Ibfcce9046f8997336a0854a0d17a56f1ece7e691
2017-06-25 14:00:05 +00:00
SzuWei Lin
9df6f1c5ca Merge "Add wificond to Android makefiles" into oc-dr1-dev
am: b1cbbaf528

Change-Id: I584ad2a70099f1fb189766df79a1c19ac6927b73
2017-06-25 13:55:06 +00:00
TreeHugger Robot
b1cbbaf528 Merge "Add wificond to Android makefiles" into oc-dr1-dev 2017-06-25 13:49:44 +00:00
Huan Ren
b2c1e7db30 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev am: 76946c6ab6 am: b2d7fa3d83
am: 65608038bc

Change-Id: I9f55bb0789cc81f0fb15ea1a0e2cd544290b1b8d
2017-06-23 19:57:02 +00:00
Huan Ren
65608038bc Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev am: 76946c6ab6
am: b2d7fa3d83

Change-Id: Ica1a7d3448f3ac7c44918df39fd84fb02cdb624c
2017-06-23 19:52:29 +00:00
Huan Ren
b2d7fa3d83 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev
am: 76946c6ab6

Change-Id: I1e48abd776c7fa9c1ae75a6a62e730bea0845c94
2017-06-23 19:47:29 +00:00
Huan Ren
874ee28b68 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev
am: 76946c6ab6

Change-Id: I2a87da8ab334e8fa7a2076677dc27bc75a09dbff
2017-06-23 19:43:01 +00:00
Huan Ren
76946c6ab6 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev 2017-06-23 18:33:16 +00:00
Tomasz Wasilczyk
4261cdc47c Remove previous implementation of RadioService.
Bug: b/36863239
Test: instrumentalization
Change-Id: Ic47b3aad2e7b9662059451bebf87ec55807a6c7c
2017-06-23 10:46:14 -07:00
Andreas Gampe
94a7b3df12 Merge "Merge "Build: Use ART phony packages in runtime_libart" am: 47b734db57 am: 2d3b1ca45a am: ac1a012d21" into oc-dr1-dev-plus-aosp
am: 2005f395de

Change-Id: Iaa633e690e19defc83bc337e645823a63974ae24
2017-06-23 02:11:32 +00:00
Bowgo Tsai
6530e2b722 Merge "Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf" into oc-dr1-dev am: 9c2b22c487
am: 908577a4f4

Change-Id: Ia0786dd4e79b9bdf893d67ceb46777f880fd9d74
2017-06-23 02:10:23 +00:00
Android Build Merger (Role)
2005f395de Merge "Merge "Build: Use ART phony packages in runtime_libart" am: 47b734db57 am: 2d3b1ca45a am: ac1a012d21" into oc-dr1-dev-plus-aosp 2017-06-23 02:07:32 +00:00
Andreas Gampe
9d8d51a7e5 Merge "Build: Use ART phony packages in runtime_libart" am: 47b734db57 am: 2d3b1ca45a
am: ac1a012d21

Change-Id: I7b4cd4affb519b863df943c583260f69b7e13719
2017-06-23 02:06:58 +00:00
Bowgo Tsai
908577a4f4 Merge "Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf" into oc-dr1-dev
am: 9c2b22c487

Change-Id: I5e076c940ea3b7a09d8f3ed4a6a5b87ce8aa0021
2017-06-23 02:06:16 +00:00
Andreas Gampe
ac1a012d21 Merge "Build: Use ART phony packages in runtime_libart" am: 47b734db57
am: 2d3b1ca45a

Change-Id: I28d9d8369f374e7b20461a4e931e70aafe3a10eb
2017-06-23 02:01:57 +00:00
TreeHugger Robot
9c2b22c487 Merge "Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf" into oc-dr1-dev 2017-06-23 02:00:42 +00:00
Andreas Gampe
ae4916b0ad Build: Use ART phony packages in runtime_libart
Move definition of necessary packages for ART to art/Android.mk.
Use the phony packages defined there in runtime_libart.mk.

Bug: 62087184
Test: m
Test: Device boots
Change-Id: Iae6e5bba2184b098820783dc5e9f6b5f2a9836e9
2017-06-22 15:35:14 -07:00
Chong Zhang
3abc30baa5 cas: add CAS hal to build
bug: 22804304
Change-Id: I05604644854a561bc9356bb66bcd7d315e3f2d5a
2017-06-21 13:37:42 -07:00
SzuWei Lin
ef8e26b220 Add audio.a2dp.default to generic system image
am: fbac1195e9

Change-Id: I0a5f13ec32cfac2caa5dbb8e979fb0dffa54be5e
2017-06-21 02:48:32 +00:00
SzuWei Lin
68ba24ab5d Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev am: 4e08677575
am: e7a5506e1f

Change-Id: Ife6d2b9ae9745ff54dfce9b7506fd3aa702f711e
2017-06-21 02:12:57 +00:00
SzuWei Lin
e7a5506e1f Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev
am: 4e08677575

Change-Id: I45aa7f7055dd4fe874daa2b1c2c8f8f317fe2f5a
2017-06-21 02:06:57 +00:00
TreeHugger Robot
4e08677575 Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev 2017-06-21 01:57:53 +00:00
SzuWei Lin
03dad3be29 Merge "Remove unnecessary items in treble_common.mk" into oc-dr1-dev am: c7232cc5d5
am: 8e51a42f90

Change-Id: Ibb2632b6b376aa53f04e9bbfce66dc8a6f1364a6
2017-06-20 17:13:43 +00:00
SzuWei Lin
8e51a42f90 Merge "Remove unnecessary items in treble_common.mk" into oc-dr1-dev
am: c7232cc5d5

Change-Id: I5e4f45335343b7e63db587ad6f9bfaa5c5eabad1
2017-06-20 17:11:14 +00:00
Lucas Dupin
d625a80914 Require sysui overlay am: a426a60a6b
am: 2fb2b6f9cc

Change-Id: Ifc214dae6cc9e0f43466757d4d989950415a039f
2017-06-20 17:07:08 +00:00
TreeHugger Robot
c7232cc5d5 Merge "Remove unnecessary items in treble_common.mk" into oc-dr1-dev 2017-06-20 17:06:42 +00:00
Lucas Dupin
2fb2b6f9cc Require sysui overlay
am: a426a60a6b

Change-Id: I036d14bc112f73d9372a0f2df56850f161bea98d
2017-06-20 16:58:23 +00:00
Bowgo Tsai
15fd373e3c Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
Note that this depends on a change in avbtool:
  https://android-review.googlesource.com/#/c/406374/

Bug: 38325029
Test: builds system.img, checks $OUT/system/compatibility_matrix.xml
      contains correct vbmeta-version
Change-Id: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
2017-06-20 18:25:36 +08:00