Commit Graph

41755 Commits

Author SHA1 Message Date
Colin Cross 0e10ff54d4 Pass PRODUCT_DEFAULT_DEV_CERTIFICATE to Soong
Bug: 69917341
Test: m checkbuild
Change-Id: I66bac6c33432210f566a713478eb2b357f648a6d
2017-12-01 17:25:34 -08:00
Colin Cross e3eb03a537 Merge "Add support for RRO in soong app prebuilts" am: cd127ac860 am: 94b0dd3236
am: ab47fd0947

Change-Id: I897daa947223323981bf9b11436c6bd106f02081
2017-12-01 22:21:13 +00:00
Colin Cross ab47fd0947 Merge "Add support for RRO in soong app prebuilts" am: cd127ac860
am: 94b0dd3236

Change-Id: I80d1c91601fb03b8459e1378ba74c12aa1e7e4cd
2017-12-01 22:16:33 +00:00
Colin Cross 94b0dd3236 Merge "Add support for RRO in soong app prebuilts"
am: cd127ac860

Change-Id: I935b2f35e3642f2c8a4bf6f4e0b7ea8882df0bbc
2017-12-01 22:11:18 +00:00
Colin Cross cd127ac860 Merge "Add support for RRO in soong app prebuilts" 2017-12-01 22:05:42 +00:00
Bo Hu 1af4421abd Merge "emulator: api 26 fix guest rendering (build)" am: fb46f47085 am: c6e1046dfb
am: d78a7ceb7f  -s ours

Change-Id: I60122a169cc517153531abb4c2599b8cc66ba2c5
2017-12-01 20:41:14 +00: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
Bo Hu fb46f47085 Merge "emulator: api 26 fix guest rendering (build)" 2017-12-01 20:21:53 +00:00
Tao Bao 25d1db4d00 Merge "Remove the redundant/wrong write of 'recovery_as_boot='." am: 4dd8610e26 am: 0ef0aef16b
am: 9391595bbb

Change-Id: I8c0b25e3c323ff5cc6facad45e0c3522336318ff
2017-12-01 19:44:46 +00:00
Tao Bao 9391595bbb Merge "Remove the redundant/wrong write of 'recovery_as_boot='." am: 4dd8610e26
am: 0ef0aef16b

Change-Id: I51314fa830ac8bc0014d8eb5fadadca85561ad72
2017-12-01 19:37:10 +00:00
Tao Bao 0ef0aef16b Merge "Remove the redundant/wrong write of 'recovery_as_boot='."
am: 4dd8610e26

Change-Id: Icf58943c1a3abb90c2a9a5aeb5175117c27be709
2017-12-01 19:33:22 +00:00
Treehugger Robot 4dd8610e26 Merge "Remove the redundant/wrong write of 'recovery_as_boot='." 2017-12-01 19:26:08 +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
Paul Duffin 21b01c5adc Merge "Switch usages of legacy-test to android.test.base" 2017-12-01 10:18:54 +00:00
Søren Gjesse f6224459ed Merge "Prepare for switching from Proguard to R8" am: 6af8e92040 am: efbd35a247
am: c35d6f16c4

Change-Id: I4786546f0dd44f7206488b0b1ddaa13400025392
2017-12-01 06:54:30 +00:00
Søren Gjesse c35d6f16c4 Merge "Prepare for switching from Proguard to R8" am: 6af8e92040
am: efbd35a247

Change-Id: Ibdb3a91401eeab8d9b9fddf738d359419887ea84
2017-12-01 06:50:23 +00:00
Søren Gjesse efbd35a247 Merge "Prepare for switching from Proguard to R8"
am: 6af8e92040

Change-Id: I26b648931723476a5cd0c9208c07352466abcc2c
2017-12-01 06:48:18 +00:00
Søren Gjesse 6af8e92040 Merge "Prepare for switching from Proguard to R8" 2017-12-01 06:41:51 +00:00
kaichieh 38c404c6da Renames sepolicy files from nonplat_* to vendor_*
Bug: 64240127
Test: normal boot and recovery boot a device
Change-Id: Ie30b4859d4d573cd2d35419195181695639f6582
2017-12-01 13:56:16 +08:00
Sundong Ahn d380917504 Merge changes from topic "system-api" am: 6e4e9f32ec am: 1fa4c44c3b
am: e71a29b6c8  -s ours

Change-Id: I31774a3afd95648b76410872466d280b0e59c5cc
2017-12-01 04:34:36 +00:00
Sundong Ahn 69b8a60896 Add LOCAL_SDK_VERSION := system_$(VER) am: 5a44d1f069 am: f3e8302088
am: f4283c5ba6  -s ours

Change-Id: I9cc3c64db0fcd458336b0cd97c31ba3bdd46109c
2017-12-01 04:34:02 +00:00
Sundong Ahn e71a29b6c8 Merge changes from topic "system-api" am: 6e4e9f32ec
am: 1fa4c44c3b

Change-Id: I91f2547bc98b6afb73c7b7e0e9844b12a0fcc598
2017-12-01 04:30:19 +00:00
Sundong Ahn f4283c5ba6 Add LOCAL_SDK_VERSION := system_$(VER) am: 5a44d1f069
am: f3e8302088

Change-Id: I12795f38fb9ff499793b15f333117324e093436f
2017-12-01 04:29:52 +00:00
Sundong Ahn 1fa4c44c3b Merge changes from topic "system-api"
am: 6e4e9f32ec

Change-Id: I95cf7c414dbd1f45fa87b1d50bf2fe97c7994178
2017-12-01 04:26:54 +00:00
Sundong Ahn f3e8302088 Add LOCAL_SDK_VERSION := system_$(VER)
am: 5a44d1f069

Change-Id: Ief08f78484b654502d356c07d61063a16aad0572
2017-12-01 04:26:10 +00:00
Colin Cross 8c5ef24107 Add support for RRO in soong app prebuilts
Let soong pass overlay directories that were not used because
of enforced RROs and use the make rules to convert them to
the auto generated RRO package.

Bug: 69917341
Test: m checkbuild
Change-Id: I9db37e0bf65c19cef91428477713e3d7f1941b83
2017-11-30 20:22:12 -08:00
Treehugger Robot 6e4e9f32ec Merge changes from topic "system-api"
* changes:
  Fix build error
  Add LOCAL_SDK_VERSION := system_$(VER)
2017-12-01 04:19:45 +00:00
Isaac Chen 532d5adf7b 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
2017-12-01 11:21:58 +08:00
Sundong Ahn 3c113098f7 Fix build error
Fix the build error when TARGET_BUILD_APPS is set

Bug: 67724799
Test: m -j TARGET_PRODUCT=full TARGET_BUILD_APPS=TVTestInput

Merged-In: I981b0a245d7e8f2dabbd4e51db52d17aeacc6106
Change-Id: I981b0a245d7e8f2dabbd4e51db52d17aeacc6106
(cherry picked from commit 8e7a4c413f)
2017-12-01 00:40:56 +00:00
Sundong Ahn 5a44d1f069 Add LOCAL_SDK_VERSION := system_$(VER)
The system_$(VER) can be set in LOCAL_SDK_VERSION, and the apk will use
android_system.jar at build time.
If LOCAL_SDK_VERSION is not defined and this module is installed in
vendor.img, LOCAL_SDK_VERSION is set to system_current.

Bug: 67724799
Test: 1. build && run on taimen
2. LOCAL_SDK_VERSION:=system_27 in ims.apk && build ims.apk && check
the vsdk_v27_intermediates.

Merged-In: I5b11c78b8fcd4a2f2a5e3b141527cd34dbe80018
Change-Id: I5b11c78b8fcd4a2f2a5e3b141527cd34dbe80018
(cherry picked from commit ef212cbe8d)
2017-12-01 00:39:07 +00:00
bohu f3aa0668c2 Merge "emulator: support system-as-root" am: 44e363f1e3 am: 253dfc22a6
am: 5909b07cc4  -s ours

Change-Id: Ie2c45d04d7d179f754b4a9ca92b64081d68636dc
2017-11-30 20:20:09 +00:00
bohu 5909b07cc4 Merge "emulator: support system-as-root" am: 44e363f1e3
am: 253dfc22a6

Change-Id: I9eab659873195ee7a46e8fc83556a0a5b011d746
2017-11-30 20:16:28 +00:00
bohu 253dfc22a6 Merge "emulator: support system-as-root"
am: 44e363f1e3

Change-Id: Ib1ea4ec4f388a1d28f6db2789029aa06c169c3da
2017-11-30 20:12:53 +00:00
Treehugger Robot 44e363f1e3 Merge "emulator: support system-as-root" 2017-11-30 20:07:58 +00:00
TreeHugger Robot 9eda23256e Merge "emulator: support system-as-root" 2017-11-30 20:02:42 +00:00
Paul Duffin a840752b68 Switch usages of legacy-test to android.test.base
The legacy-test library has been deprecated in favour of the
android.test.base library which will be exposed to developers in
similar manner to android.test.runner and android.test.mock.

Bug: 30188076
Test: make checkbuild && make droid && flash
Change-Id: I36a9ccf8a1b4b7b75ce1ca4893daa3db6e660b30
2017-11-30 17:13:36 +00:00
Jae Shin cb01a2c1c8 Merge "Include config files to VNDK snapshot" am: 2e42c54028 am: 6e11749f59
am: c9110ae56a

Change-Id: Ia7d0263b7c6986da52cb889ee52582313ba6f33d
2017-11-30 11:13:47 +00:00
Jae Shin c9110ae56a Merge "Include config files to VNDK snapshot" am: 2e42c54028
am: 6e11749f59

Change-Id: I8a00bbb9472867082f1cafa551ae1f373a88b831
2017-11-30 11:11:12 +00:00
Jae Shin 6e11749f59 Merge "Include config files to VNDK snapshot"
am: 2e42c54028

Change-Id: I8bd9c608258475747ec173eb4a3c2d91d460591a
2017-11-30 11:08:38 +00:00
Jae Shin 2e42c54028 Merge "Include config files to VNDK snapshot" 2017-11-30 11:04:19 +00:00
Jae Shin 4736dc188e Include config files to VNDK snapshot
Additionally package ld.config.txt, llndk.libraries.txt,
vndksp.libraries.txt, vndkcore.libraries.txt,
vndkprivate.libraries.txt.

Also defer packaging TARGET_2ND_ARCH build outputs.

Test: m -j vndk dist
Test: development/vndk/snapshot/build.sh
Bug: 66059995
Change-Id: I2a85dde60824126dd16fd3732ddb0af8ae06d934
2017-11-30 11:04:06 +00:00
TreeHugger Robot b4ccf714c0 Merge "Fix build error" 2017-11-30 10:24:43 +00:00
Sundong Ahn 8e7a4c413f Fix build error
Fix the build error when TARGET_BUILD_APPS is set

Bug: None
Test: make -j40 && make -j110 showcommands dist
TARGET_BUILD_APPS='TimeZoneData TimeZoneData_test1 TimeZoneData_test2'
TARGET_BUILD_VARIANT=userdebug

Change-Id: I981b0a245d7e8f2dabbd4e51db52d17aeacc6106
2017-11-30 08:33:06 +00:00
Dan Willemsen 2f86b432b0 Merge changes from topic "clang_supported" am: 30f514cc51 am: d7ac0198d9
am: f5fe7af413

Change-Id: I3b29abe75008c128d8b180f2798cef6184a382c1
2017-11-30 08:20:09 +00:00
Dan Willemsen f4505a095a Fix / suppress warnings for clang+mingw am: 25c73e9156 am: 9be8a79255
am: 215b6bddbe

Change-Id: I6822c72da477cb691b387009e6c3da40af21d12e
2017-11-30 08:19:36 +00:00
Dan Willemsen f5fe7af413 Merge changes from topic "clang_supported" am: 30f514cc51
am: d7ac0198d9

Change-Id: I80095e128b66de0ea5d295e7b4b2e707529bc74e
2017-11-30 08:15:55 +00:00
Dan Willemsen 215b6bddbe Fix / suppress warnings for clang+mingw am: 25c73e9156
am: 9be8a79255

Change-Id: I5a625aa5dcaebd9255cd9b8808ec859a9c672531
2017-11-30 08:15:30 +00:00
Dan Willemsen d7ac0198d9 Merge changes from topic "clang_supported"
am: 30f514cc51

Change-Id: Ie6327c5bdeab61452d19284761953acbba1598b7
2017-11-30 08:12:40 +00:00
Dan Willemsen 9be8a79255 Fix / suppress warnings for clang+mingw
am: 25c73e9156

Change-Id: I7f60ee6efc214605c397f91656f7aaf0a76a038d
2017-11-30 08:11:57 +00:00