Commit graph

15033 commits

Author SHA1 Message Date
Tao Bao
3652c0ba76 Merge "Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS." am: d30b75190d
am: 4d45f51596

Change-Id: Id6da54fe3f1cd4ebba63de849a065ffcd53b261e
2017-12-18 22:27:57 +00:00
Treehugger Robot
d30b75190d Merge "Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS." 2017-12-18 22:17:46 +00:00
Baligh Uddin
10882a317c Merge "Add generate_verity_key (+dependencies) to otatools package." am: c4f76d670a
am: d60a86c3ca

Change-Id: I410319047ff19c0978e94a5a04e6a02083fccb24
2017-12-18 20:47:35 +00:00
Baligh Uddin
c8bef14c9f Add generate_verity_key (+dependencies) to otatools package. 2017-12-18 10:40:57 -08:00
Steven Moreland
9874ee6c54 Merge changes from topic "kati-obsolete-full-treble" am: 2b1f0d1810
am: a710d44086

Change-Id: I39b94bef18b12f0e55bc1d0eaabde2ba85f00146
2017-12-18 17:57:42 +00:00
Treehugger Robot
2b1f0d1810 Merge changes from topic "kati-obsolete-full-treble"
* changes:
  .KATI_obsolete PRODUCT_FULL_TREBLE.
  PRODUCT_NOTICE_SPLIT from PRODUCT_FULL_TREBLE
2017-12-18 17:46:25 +00:00
Steven Moreland
5dcea5de76 .KATI_obsolete PRODUCT_FULL_TREBLE.
It has been broken up into subflags, and usage has been cleaned up.

Bug: 69865032
Test: can't use PRODUCT_FULL_TREBLE
Change-Id: Ia38366a30132f129d09c6f4a985402c202bace62
2017-12-18 17:45:55 +00:00
Dan Albert
892e4d3ec9 Merge "Depend on the more specific ndk timestamp." am: 6663c8476a
am: f6c5be1e8e

Change-Id: I3186e73b7779979081cb6d2a81d34079d2d65218
2017-12-16 03:22:34 +00:00
Treehugger Robot
6663c8476a Merge "Depend on the more specific ndk timestamp." 2017-12-16 03:14:43 +00:00
Chih-Hung Hsieh
322f7fd374 Merge "Call clang-tidy with -quiet unless WITH_TIDY is set." am: 305d2abb27
am: c1ddbf65be

Change-Id: I3bd0584158e60f67f7dcab5b9f6e02b54428811a
2017-12-16 01:59:20 +00:00
Treehugger Robot
305d2abb27 Merge "Call clang-tidy with -quiet unless WITH_TIDY is set." 2017-12-16 01:53:44 +00:00
Dan Albert
9b661597f6 Merge "Remove support for pre-r13 NDKs." am: 9d3270bd52
am: 28cc8a9c83

Change-Id: I2695424c9de939c26432480d17cf01116b996af1
2017-12-16 01:25:07 +00:00
Treehugger Robot
9d3270bd52 Merge "Remove support for pre-r13 NDKs." 2017-12-16 01:15:29 +00:00
Colin Cross
0293f40441 Merge "Fix swapped certificate and private key in soong apps" am: 9b93a8892a
am: 29e9b0f220

Change-Id: I9268bb95f0cbfc1b1054b9f51834d7f86e7581a8
2017-12-16 00:16:18 +00:00
Colin Cross
6a825da3d9 Merge "Export app implementation and header jars" am: 1ea9c644c8
am: e0beddc068

Change-Id: Ifecc3b40e86190d6c3a1fcd9886fd44c41cc5d63
2017-12-16 00:14:51 +00:00
Colin Cross
9b93a8892a Merge "Fix swapped certificate and private key in soong apps" 2017-12-16 00:04:07 +00:00
Colin Cross
1ea9c644c8 Merge "Export app implementation and header jars" 2017-12-16 00:00:24 +00:00
Chih-Hung Hsieh
6375b6d730 Call clang-tidy with -quiet unless WITH_TIDY is set.
* Default builds calls clang-tidy only if enabled locally.
  In this case, clang-tidy should be quiet.
* If WITH_TIDY is 1 or true, let clang-tidy emit default messages.
* Even with -quiet and all warnings are suppressed,
  clang-tidy emits one line message of the number of suppressed messages.
  This one-liner could be suppressed in future changes.

Bug: 69051430
Test: default build and build with WITH_TIDY=1
Change-Id: I3138ef45fc4372f904787bd1a391e8d88050f0b3
2017-12-15 15:41:14 -08:00
Dan Shi
638fdf443b Merge "Create build artifact tradefed-tests_list.zip" am: 8c2007cf4d
am: f23aa88514

Change-Id: Icb61400f9c88588fecf557155987dceff89827e6
2017-12-15 23:36:06 +00:00
Dan Albert
3d1d1ead79 Remove support for pre-r13 NDKs.
We only have r16 checked in now.

Test: make native
Bug: None
Change-Id: I1600598cf86f803f9fdcf3fa5ada8d1871c98b65
2017-12-15 15:25:06 -08:00
Treehugger Robot
8c2007cf4d Merge "Create build artifact tradefed-tests_list.zip" 2017-12-15 23:25:01 +00:00
Steven Moreland
ae69e5787a PRODUCT_NOTICE_SPLIT from PRODUCT_FULL_TREBLE
- until PRODUCT_NOTICE_SPLIT is the default
- disallow PRODUCT_NOTICE_SPLIT_OVERRIDE because it
  doesn't need to be differentiated.

Bug: 69865032
Test: manual
Change-Id: I4a29c298862fc9fab51755bf19f236f61fbd784d
2017-12-15 14:52:07 -08:00
Dan Albert
b86ff3828a Merge "Revert "Default NDK modules to libc++_shared."" am: aec47c67cd
am: 041ea591ae

Change-Id: I62e2cdbe3d88a60898140700e410f11592c48415
2017-12-15 21:51:39 +00:00
Colin Cross
4e34ce054c Fix swapped certificate and private key in soong apps
The .x509.pem file should be in CERTIFICATE, and the .pk8 file
in PRIVATE_KEY.

Bug: 70669383
Test: examine apkcerts.txt
Change-Id: I480f19be2efbbd72ea23ebd681f312b94accfd7a
2017-12-15 13:41:24 -08:00
Colin Cross
75a698b394 Export app implementation and header jars
Also fix a missing dependency on the jacoco-report-classes.jar

Test: m checkbuild
Change-Id: I67e924051e1029a409b82f2220811a27d5401db9
2017-12-15 13:41:24 -08:00
Treehugger Robot
aec47c67cd Merge "Revert "Default NDK modules to libc++_shared."" 2017-12-15 21:39:29 +00:00
Steven Moreland
a36a56b101 Merge "Remove Treble from soong_config.mk" am: b982d8b7ae
am: c4ee99f4ca

Change-Id: I2c5aa73b40e73951b57bfda52382eaeaab756788
2017-12-15 20:19:51 +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
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
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
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
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
7c78b36d96 Merge "Expose Treble requirement variables in Soong." am: 4b7ab33f4e
am: 3b6bec05b2

Change-Id: Ib059e3fe14412178dde620d15f814021bb5cd5f5
2017-12-15 17:51:12 +00:00
Treehugger Robot
4b7ab33f4e Merge "Expose Treble requirement variables in Soong." 2017-12-15 17:41:28 +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
Søren Gjesse
db48a0fccc Merge "Revert "Enable R8 by default (second attempt)"" am: adcd4c761d
am: a2e6d78ce6

Change-Id: I2c44fd88ff47eacd0f3696624484f866b0122357
2017-12-15 15:39:16 +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
529d047513 Merge "Enable R8 by default (second attempt)" am: 837408b4ca
am: f692713515

Change-Id: I11ce3614226ced16b0e8d335e2e394e0c22f3501
2017-12-15 11:15:28 +00:00
Søren Gjesse
837408b4ca Merge "Enable R8 by default (second attempt)" 2017-12-15 11:05:25 +00:00
TreeHugger Robot
85dcb56652 Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." into oc-mr1-dev-plus-aosp 2017-12-15 05:35:56 +00:00
Joe Onorato
3de3a74659 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-14 19:58:43 -08:00
Dan Albert
9bd305948d Merge "Default NDK modules to libc++_shared." am: 587ced4a80
am: 1316e40597

Change-Id: Ibb40392071cfba45b1a20b07c73762111841a77d
2017-12-15 02:39:12 +00:00
Treehugger Robot
587ced4a80 Merge "Default NDK modules to libc++_shared." 2017-12-15 02:29:58 +00: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
e29acfd7f9 Merge "Add Soong modules to apkcerts" am: c212517c9b
am: f202d3f0c2

Change-Id: If7747c7cb3907a531e128cbb476ff0b88dc5c7f7
2017-12-14 22:30:52 +00:00
Dan Albert
248b832d44 Depend on the more specific ndk timestamp.
There are now two NDK sysroot timestamp files: ndk_base which depends
on the headers and stub libraries, and ndk which depends on ndk_base
and the static libraries. For building modules that need the NDK, we
only need to depend on the base sysroot.

Test: make native
Bug: None
Change-Id: I803032eda125a632d780c9cde10f47270491d0d2
2017-12-14 13:52:04 -08:00