Commit Graph

41050 Commits

Author SHA1 Message Date
Tao Bao 97b4ef1583 Merge "releasetools: Remove deprecated pylint options." am: 3694e104b7
am: ead6281575

Change-Id: Ic49bd5d63cdd738f22dbad1dbbf3d9ab2837db49
2017-12-05 18:52:12 +00:00
Tao Bao ead6281575 Merge "releasetools: Remove deprecated pylint options."
am: 3694e104b7

Change-Id: I87a9d6b07dc281bacc99e2935f0835958c3d67b5
2017-12-05 18:45:56 +00:00
Tao Bao 3694e104b7 Merge "releasetools: Remove deprecated pylint options." 2017-12-05 18:27:17 +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
Chih-Hung Hsieh 1ce563645f Merge "No need to dump modules added -Werror." am: 531ce804ea
am: 614877c921

Change-Id: I6784a6314940beb1d69f4cb413579e8c8e84a8f5
2017-12-05 01:46:36 +00:00
Colin Cross 2d9c3461fc Merge "Add support for LOCAL_GENERATED_SOURCES to droiddoc" am: 59dddf42a4
am: cf6b01c678

Change-Id: I4c300a05546bf0643afedd0e17019fa11a242e56
2017-12-05 01:40:27 +00:00
Justin Yun cb8136d054 Merge "Check conformity of VNDK version"
am: 6125d749ab

Change-Id: I9e4ded0975e6ba8d44658e40a59ed34a88a18c14
2017-12-05 01:38:18 +00:00
Chih-Hung Hsieh 614877c921 Merge "No need to dump modules added -Werror."
am: 531ce804ea

Change-Id: Ic8646bfe0d0c2e124ae32cfdc17c788d398e40b7
2017-12-05 01:37:16 +00:00
Colin Cross cf6b01c678 Merge "Add support for LOCAL_GENERATED_SOURCES to droiddoc"
am: 59dddf42a4

Change-Id: Iaf71dbf2fa724306ff60b770f834c0deaf7f80da
2017-12-05 01:29:31 +00:00
Treehugger Robot 6125d749ab Merge "Check conformity of VNDK version" 2017-12-05 01:24:54 +00:00
Treehugger Robot 531ce804ea Merge "No need to dump modules added -Werror." 2017-12-05 01:24:49 +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
Steven Moreland af11e4ab51 Merge "Revert "Include Treble metadata on Treble enabled devices"" am: 79a55b3108
am: c8a55698ac

Change-Id: Id027e132c54dcf39aca2755e519dc923b03a0fa8
2017-12-05 01:16:59 +00:00
Colin Cross 59dddf42a4 Merge "Add support for LOCAL_GENERATED_SOURCES to droiddoc" 2017-12-05 01:08:41 +00:00
Colin Cross eb1012b1d4 Add support for LOCAL_GENERATED_SOURCES to droiddoc
BUILD_DROIDDOC allows LOCAL_SRC_FILES to refer to sources in
$(LOCAL_PATH) and LOCAL_INTERMEDIATE_SOURCES to refer to sources
in $(TARGET_OUT_COMMON_INTERMEDIATES).  The droiddoc rules that
use files generated in Soong were trying to abuse LOCAL_SRC_FILES
to point to files in $(OUT_DIR)/soong using ../.. to counter
$(LOCAL_PATH), but failed if $(OUT_DIR) was absolute.  Add
LOCAL_GENERATED_SOURCES that can take a path relative to the
top of the source tree or an absolute path.

Bug: 70166718
Test: m OUT_DIR=/tmp/out docs
Change-Id: Iaf0d622a3405da0bf520f7312e11e75e9328062e
Merged-In: Iaf0d622a3405da0bf520f7312e11e75e9328062e
(cherry-picked from commit 4c44a94dab)
2017-12-05 01:07:23 +00:00
Steven Moreland c8a55698ac Merge "Revert "Include Treble metadata on Treble enabled devices""
am: 79a55b3108

Change-Id: I54d681b2112ebc9b52784a5da3b15eed52a2f2de
2017-12-05 00:42:11 +00:00
Treehugger Robot 79a55b3108 Merge "Revert "Include Treble metadata on Treble enabled devices"" 2017-12-05 00:32:57 +00:00
Chih-Hung Hsieh ab149cbda0 No need to dump modules added -Werror.
* This reduces size of output file wall_werror.txt.
* Stop collecting $(MODULES_ADDED_WERROR)

Bug: 66996870
Test: normal build
Change-Id: Id750cc7fe6489a7654b20740d503226ec6941bbb
2017-12-04 15:23:37 -08:00
Tao Bao dac0c88d9d releasetools: Remove deprecated pylint options.
This option u'required-attributes' will be removed in Pylint 2.0
This option u'ignore-iface-methods' will be removed in Pylint 2.0

Test: pylint (1.6.5) no longer gives above warnings.
Change-Id: Ib07cd5aef87407260140c1fca0b11c439cbdf390
2017-12-04 12:15:23 -08:00
Steven Moreland 7a9b07f6fe Revert "Include Treble metadata on Treble enabled devices"
The test rather than the build system needs to check
the files according to the versions of the provided
device (and it does so now).

Fixes: 69864925
Test: clean revert, manual

(revert of cb5b8d2d47)

Change-Id: I1922190bfadca74d0652440fe61e29f22a846cf7
2017-12-04 09:37:39 -08:00
Colin Cross 39296fbc53 Merge "Pass PRODUCT_DEFAULT_DEV_CERTIFICATE to Soong" am: b8e08222d9
am: 37976b777b

Change-Id: I1d7b2d49d8e793d47d21351a9dfc22e25d2d108b
2017-12-02 04:50:36 +00:00
Colin Cross 37976b777b Merge "Pass PRODUCT_DEFAULT_DEV_CERTIFICATE to Soong"
am: b8e08222d9

Change-Id: Ifdeb490975206b5bd67a0471432c260a1614fdea
2017-12-02 04:46:16 +00:00
Treehugger Robot b8e08222d9 Merge "Pass PRODUCT_DEFAULT_DEV_CERTIFICATE to Soong" 2017-12-02 04:41:44 +00:00
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 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 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 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
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
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
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 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
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