Commit Graph

40911 Commits

Author SHA1 Message Date
Dan Albert 041ea591ae Merge "Revert "Default NDK modules to libc++_shared.""
am: aec47c67cd

Change-Id: I87389aaa55fea26377441341c37e7cf5bcf4a71b
2017-12-15 21:46:32 +00:00
Treehugger Robot aec47c67cd Merge "Revert "Default NDK modules to libc++_shared."" 2017-12-15 21:39:29 +00:00
Steven Moreland c4ee99f4ca Merge "Remove Treble from soong_config.mk"
am: b982d8b7ae

Change-Id: I50c9400d9fb620d509304af58fc908fe2099e870
2017-12-15 20:14:44 +00:00
Treehugger Robot b982d8b7ae Merge "Remove Treble from soong_config.mk" 2017-12-15 20:07:21 +00:00
Dan Albert 37099686c0 Revert "Default NDK modules to libc++_shared."
This reverts commit 6168f5baf1.

Reason for revert: http://b/70718590

Change-Id: I3e7afe3d1642260c2b5103cb07c636b0b5d72379
2017-12-15 20:01:03 +00:00
Joe Onorato 3f443418f7 Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime."
am: fa839296ea

Change-Id: Ibc8c2d2236d0b8cc1d77f741784a323171a07db5
2017-12-15 19:47:17 +00:00
Joe Onorato fa839296ea Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." 2017-12-15 19:39:46 +00:00
Bo Hu 02ade23601 Merge "emulator: disable location service"
am: d9ee7467fd

Change-Id: Ic4ff286f53ebba8fd295d825361b8cc0fc4547d6
2017-12-15 19:22:07 +00:00
Bo Hu d9ee7467fd Merge "emulator: disable location service" 2017-12-15 19:14:20 +00:00
Yifan Hong 5ac5e6b757 Merge changes from topic "fcm_version"
am: b1b5a0969b

Change-Id: I5f5471a58dd5d309c7b446d0ae3910993d47e239
2017-12-15 19:05:07 +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 fcdf772f67 Merge "Rename VINTF XML module names"
am: d8d276c5a6

Change-Id: If375ca187bffd24b7534e84d513c89a756be2b67
2017-12-15 18:53:52 +00:00
Treehugger Robot d8d276c5a6 Merge "Rename VINTF XML module names" 2017-12-15 18:46:20 +00:00
Steven Moreland 60b0f06d9b Remove Treble from soong_config.mk
This variable has been broken up into smaller components.

Bug: 62019611
Test: nothing uses it
Change-Id: Ic985e42179df24a43d9a0d0047a31ecd3bf35ec7
2017-12-15 10:26:52 -08:00
Steven Moreland 3b6bec05b2 Merge "Expose Treble requirement variables in Soong."
am: 4b7ab33f4e

Change-Id: If46731ff8cab13b209869c0f8f315239a39cf837
2017-12-15 17:45:43 +00:00
Treehugger Robot 4b7ab33f4e Merge "Expose Treble requirement variables in Soong." 2017-12-15 17:41:28 +00:00
Tao Bao 2bc1b967c1 Merge "releasetools: Add common.ZipDelete()."
am: 23f7ea9e70

Change-Id: I3a7d811a3b7589d324168c0c6afaf62438fda5b5
2017-12-15 16:42:50 +00:00
Joe Onorato bfc7811441 When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime.
With LOCAL_PROTO_OPTIMIZE_TYPE set to one of the lite variants, the build system thinks
the proto should be compiled with lite, and will link in the line runtime libs. But if
the .proto files don't contain the directive to compile the source as lite
(option optimize_for = LITE_RUNTIME;), then the generated code will be full and the
libraries will be full, and it won't link.

Test: make
Merged-In: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
Change-Id: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
2017-12-15 08:40:48 -08:00
Tao Bao 23f7ea9e70 Merge "releasetools: Add common.ZipDelete()." 2017-12-15 16:36:55 +00:00
Søren Gjesse a2e6d78ce6 Merge "Revert "Enable R8 by default (second attempt)""
am: adcd4c761d

Change-Id: Ifa538a0985548e5188601045131022ecfe50bcf8
2017-12-15 15:33:08 +00:00
Søren Gjesse adcd4c761d Merge "Revert "Enable R8 by default (second attempt)"" 2017-12-15 15:27:16 +00:00
Søren Gjesse cd13676221 Revert "Enable R8 by default (second attempt)"
This reverts commit f2a697725c.

Reason for revert: b/70710434

Change-Id: Ia6d42e4c2fc7e7a4ca67d42d7aaa57ab95c2cc9a
2017-12-15 15:18:57 +00:00
Søren Gjesse f692713515 Merge "Enable R8 by default (second attempt)"
am: 837408b4ca

Change-Id: I1fb287f61cedbf1875c57b1d821b1179141bf950
2017-12-15 11:10:26 +00:00
Søren Gjesse 837408b4ca Merge "Enable R8 by default (second attempt)" 2017-12-15 11:05:25 +00:00
Dan Albert 1316e40597 Merge "Default NDK modules to libc++_shared."
am: 587ced4a80

Change-Id: I704594e8b8980747d30b7d45b3189d37ec729422
2017-12-15 02:36:34 +00:00
Treehugger Robot 587ced4a80 Merge "Default NDK modules to libc++_shared." 2017-12-15 02:29:58 +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
Tao Bao 89d7ab23e8 releasetools: Add common.ZipDelete().
We have been shelling out to 'zip -d' to delete existing ZIP entries in
add_img_to_target_files.py. This CL moves the function into common.py,
and calls that for the similar work in ota_from_target_files.py. This CL
also adds unittests for the newly added function.

Test: `m dist`
Test: python -m unittest test_common
Test: ota_from_target_files.py generates identical packages w/ and w/o
      the CL (so we know the streaming property computation is intact).
Test: Run 'add_img_to_target_files.py -a' that triggers a call to
      ReplaceUpdatedFiles().
Change-Id: Icaa6c3ea3ee2166023f78fa79275295f837ea842
2017-12-14 17:17:04 -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
Yifan Hong 97de88c14e PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
It is replaced by FCM Version specified in the device manifest
directly.

Test: builds
Bug: 69636193
Change-Id: I9e2b871b4c6190107ba9fbb36495bb41c461a0a3
Merged-In: I9e2b871b4c6190107ba9fbb36495bb41c461a0a3
2017-12-14 15:35:15 -08:00
Dan Albert 6168f5baf1 Default NDK modules to libc++_shared.
Test: make native
Bug: None
Change-Id: I9ca2313c2082e9841a20e240ffca84219a419d49
2017-12-14 14:45:33 -08:00
Colin Cross f202d3f0c2 Merge "Add Soong modules to apkcerts"
am: c212517c9b

Change-Id: Ifb3ae2be0a6f801d56ccb9ff971cabf9cb4e4dd9
2017-12-14 22:26:40 +00:00
Tao Bao 8baa6d4dcd Merge "releasetools: Remove '-w' from ota_from_target_files options."
am: 78b5724622

Change-Id: I32782d498643a8e15141f28443268a7191c60a59
2017-12-14 22:24:45 +00:00
Colin Cross c212517c9b Merge "Add Soong modules to apkcerts" 2017-12-14 22:20:08 +00:00
Treehugger Robot 78b5724622 Merge "releasetools: Remove '-w' from ota_from_target_files options." 2017-12-14 22:18:56 +00:00
Søren Gjesse f2a697725c Enable R8 by default (second attempt)
Test: m -j PRODUCT-aosp_x86-userdebug
Test: Check that some .vdex files built have R8 generated code
Change-Id: I06903dc30c802bbcffd6992c3c25a1b711a5875c
2017-12-14 22:24:48 +01:00
Colin Cross aec3640560 Add Soong modules to apkcerts
Bug: 70669383
Test: m apkcerts-list contains framework-res
Change-Id: I00c5c5d9e7311bbe4f16bf48407dd0efa242c7aa
2017-12-14 12:29:30 -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
Steven Moreland 0cf92b0c57 Expose Treble requirement variables in Soong.
As a followup to this, Treble will be removed. It's too generic
to be used with any reliability or meaning. Individual switches
also mean that they can be used independently.

Bug: 62019611
Test: manual
Change-Id: Ib1bd7d23510daac70a4520b9082f7492b8cbf027
2017-12-13 14:07:13 -08:00
Colin Cross e6dc6b2026 Merge "Replace build/tools with build/make/tools"
am: 973301af79

Change-Id: I3303c4c8883b76bb2b687e07a8c1834811caf5a4
2017-12-13 02:42:37 +00:00
Treehugger Robot 973301af79 Merge "Replace build/tools with build/make/tools" 2017-12-13 02:34:42 +00:00
Justin Yun db00ea991d Merge "Define PLATFORM_VNDK_VERSION"
am: 553de17d44

Change-Id: Ieeb576473577a712d94bfd4fe8af98251003be4c
2017-12-13 02:03:09 +00:00
Alan Leung 6bba1f1ca2 Merge "Avoid feeding D8 with dex files."
am: c0eabe6d34

Change-Id: I4c22efe2b6766341fef64be151ef6f4a944a2cb8
2017-12-13 02:01:56 +00:00
Treehugger Robot 553de17d44 Merge "Define PLATFORM_VNDK_VERSION" 2017-12-13 01:49:41 +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
Treehugger Robot c0eabe6d34 Merge "Avoid feeding D8 with dex files." 2017-12-13 01:29:40 +00:00
Alan Leung aff156bd49 Avoid feeding D8 with dex files.
Some test targets include dex files as resource to be loaded
at runtime. This is an issue since full D8 also take dex files
as input.

This CL extracts only the class files and feed that to D8 instead
of the whole jar.

Test: USE_D8_DESUGAR=true m checkbuild tests
Bug: 69329508

Change-Id: I52d80ec01933573f18eb497472a80b6a649c9dae
2017-12-12 15:51:25 -08:00
Colin Cross 5d8b68daca Merge "Add soong_docs to droidcore"
am: f027511929

Change-Id: I353b59cfbd7bf86eac0b999f86cb32f9193e3a68
2017-12-12 23:43:25 +00:00
Colin Cross f027511929 Merge "Add soong_docs to droidcore" 2017-12-12 23:02:55 +00:00
Colin Cross 2c1da1e95f Add soong_docs to droidcore
Bug: 70516282
Test: treehugger
Change-Id: I818ad6f948502f4beb0205b583687c1d9fa563ac
2017-12-12 11:11:48 -08:00