Commit Graph

21355 Commits

Author SHA1 Message Date
Treehugger Robot
8e49cf8502 Merge "Clean com.android.neuralnetworks APEX whitelist" am: 0d4b9e32d0
Change-Id: Iaacaa13a09d9a6e24b506c9d3e87f3a777891a64
2020-04-09 12:40:22 +00:00
Treehugger Robot
0d4b9e32d0 Merge "Clean com.android.neuralnetworks APEX whitelist" 2020-04-09 12:16:37 +00:00
Yi Kong
a3c22e7ee2 Pass -Brepro ldflag to Windows builds
The default build-id is generated using timestamp. Pass -Brepro to
avoid using timestamp for deterministic build.

Bug: 153462962
Test: build fastboot.exe twice, got same shasum
Change-Id: I38fe993eec23c60bfcf1b76188774bfe06839fa4
2020-04-09 15:53:11 +08:00
Jaewoong Jung
71309cf6a5 Merge "Collect JNI coverage data only for first target." into rvc-dev am: aeb9e6ffe8
Change-Id: Ie698bc61ff48e5729393934a146855f4d8c45df4
2020-04-09 04:50:44 +00:00
Jaewoong Jung
aeb9e6ffe8 Merge "Collect JNI coverage data only for first target." into rvc-dev 2020-04-09 04:38:31 +00:00
Treehugger Robot
8c8763567d Merge "Remove conscrypt.module.intra.core.api.stubs from apex white list" am: b54015fa54 am: b9fd69e8af
Change-Id: I5338969f71eb6a39606d4f9627ea2c8fbc14e7d8
2020-04-09 02:31:29 +00:00
Treehugger Robot
f4c1fc4538 Merge "Remove conscrypt.module.intra.core.api.stubs from apex white list" am: b54015fa54 am: b9fd69e8af
Change-Id: I189f2448d849c9893d12be300afa777aae784092
2020-04-09 02:31:09 +00:00
Treehugger Robot
b9fd69e8af Merge "Remove conscrypt.module.intra.core.api.stubs from apex white list" am: b54015fa54
Change-Id: I3bf72f21eace8bbc4c55340809ec9e8b4c51a262
2020-04-09 02:18:55 +00:00
Treehugger Robot
b54015fa54 Merge "Remove conscrypt.module.intra.core.api.stubs from apex white list" 2020-04-09 02:06:41 +00:00
Paul Duffin
1fd005d5b3 Export API files as part of the java_sdk_library
Bug: 153443117
Test: m nothing

Change-Id: I9d6f5b91a7cc25019e2eb9e3c138f0874d2831de
2020-04-09 01:33:46 +01:00
Paul Duffin
3d1248ceb6 Export stub sources as part of the java_sdk_library
Minor refactoring of checkMergeZip(string) -> checkMergeZips(...string)
to allow testing of multiple merge zips.

Bug: 153443117
Test: m nothing
Change-Id: I8db00f611ced15f8476ba16f2834a72e8c913596
2020-04-09 01:32:38 +01:00
Paul Duffin
bbb546b2da Extract createJavaImportForStubs()
Bug: 153443117
Test: m nothing
Change-Id: If74eea675b7ab4aeaa821294f2a137c95f794d4f
2020-04-09 01:32:38 +01:00
Paul Duffin
46a26a8871 Generate struct with field for each api scope
Makes it easier to add new api scopes by generating a struct with a
field for each scope.

Bug: 153443117
Test: m nothing
Change-Id: Iec77a858d2c851d99e56568b89cb30aa3ff2a244
2020-04-09 01:32:38 +01:00
Paul Duffin
dd46f71493 Support java_sdk_library as member of sdk
Bug: 153443117
Test: m nothing
Change-Id: I9d8089b2555038e3f10ad5939a6a7b01839c67ea
2020-04-09 01:32:38 +01:00
Jooyung Han
784472dfb8 Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" into rvc-dev am: 045f3db022
Change-Id: I220ce66b3ed924dda7f4e68b716463893a9156e7
2020-04-08 23:56:21 +00:00
Jooyung Han
045f3db022 Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" into rvc-dev 2020-04-08 23:41:54 +00:00
Jaewoong Jung
e62e594a24 Collect JNI coverage data only for first target.
Modules with compile_multilib property set to "both" cause builds to
fail due to duplicate Make recipes. Fix it by outputting reports only
for the first target for now.

Bug: 153461674
Test: Built cts with the coverage flags set.
Change-Id: Ibb8da6e9c112a857695cd7095a62c910cddfbb94
2020-04-08 16:33:23 -07:00
Chih-hung Hsieh
d4262977d4 Merge "Disable bugprone-reserved-identifier" am: 88a7176174 am: 8fd48a2b4b
Change-Id: I74bb709c4ca9df981bcd2e1ceaae4c85c44f97c8
2020-04-08 22:55:26 +00:00
Chih-hung Hsieh
8c1ec51e29 Merge "Disable bugprone-reserved-identifier" am: 88a7176174 am: 8fd48a2b4b
Change-Id: Ieff365335d6c5b43fabdd88a2f3c5514e61bfc4c
2020-04-08 22:55:22 +00:00
Chih-hung Hsieh
8fd48a2b4b Merge "Disable bugprone-reserved-identifier" am: 88a7176174
Change-Id: I0a02bf6d93f21879b95740df0b198ecc6c190a88
2020-04-08 22:42:16 +00:00
Chih-hung Hsieh
88a7176174 Merge "Disable bugprone-reserved-identifier" 2020-04-08 22:29:26 +00:00
Dan Albert
2347bd076a Document the file format used by gen_stub_libs.py.
Test: None, docs
Bug: None
Change-Id: Ice3d9f324beba4695e4abf64632ad766865a72da
2020-04-08 15:03:25 -07:00
Colin Cross
c27185cd72 Merge "Revert^2 "Add sdk mutator for native modules"" am: ff550f3e13 am: 7af7725de1
Change-Id: I9a947c10e593f7b1647440acca4de08952e7928e
2020-04-08 18:42:10 +00:00
Colin Cross
6ad132437a Merge "Revert^2 "Add sdk mutator for native modules"" am: ff550f3e13 am: 7af7725de1
Change-Id: I7f9a62431d95adf92245aae618c0889f5d548484
2020-04-08 18:42:05 +00:00
Colin Cross
7af7725de1 Merge "Revert^2 "Add sdk mutator for native modules"" am: ff550f3e13
Change-Id: Ia7bf6cc6779823787971eb70e89013c29f4e8784
2020-04-08 18:32:54 +00:00
Colin Cross
ff550f3e13 Merge "Revert^2 "Add sdk mutator for native modules"" 2020-04-08 18:29:30 +00:00
Paul Duffin
e2cfe9ce92 Remove conscrypt.module.intra.core.api.stubs from apex white list
It is no longer needed because non-static java_library dependencies are
not considered to be part of the depending APEX.

Bug: 153443117
Test: m nothing
Change-Id: I7d58d1047b2d400395a253e492b35008284778ff
2020-04-08 19:12:58 +01:00
Treehugger Robot
f9e4f92aa9 Merge "Make the names of 'soong_config_module_type_import' modules unique." am: 9e06bb64ca am: 061064223d
Change-Id: Ic068561bfbccd1136616e7cfde4a944cb5f66a53
2020-04-08 18:12:23 +00:00
Treehugger Robot
e6a1fede8a Merge "Make the names of 'soong_config_module_type_import' modules unique." am: 9e06bb64ca am: 061064223d
Change-Id: I38ea5a6b4c3931c562670d86b7604b15dd721e3d
2020-04-08 18:12:20 +00:00
Stephen Hines
e628a9328c Merge "Switch to clang-r377782d (10.0.6)." am: 719ea2b849 am: 3a2291f125
Change-Id: I0102545dc2a05b59d1b746ff8dc78f0c6af6d55e
2020-04-08 18:11:54 +00:00
Stephen Hines
82653cfbad Merge "Switch to clang-r377782d (10.0.6)." am: 719ea2b849 am: 3a2291f125
Change-Id: I59b0203bd1b4fb35a809db1376e827c905abd1d8
2020-04-08 18:11:41 +00:00
Treehugger Robot
061064223d Merge "Make the names of 'soong_config_module_type_import' modules unique." am: 9e06bb64ca
Change-Id: If52bc9a9c3c867002b3f182db19737bbb1e48fad
2020-04-08 17:56:49 +00:00
Stephen Hines
3a2291f125 Merge "Switch to clang-r377782d (10.0.6)." am: 719ea2b849
Change-Id: I83a769b9cdbb5947a0ed67dc76622aa39f0c3856
2020-04-08 17:56:29 +00:00
Paul Duffin
3ae2951296 Allow droidstubs to not generate any stubs
Needed to optimize the handling of the module_lib API surface which
currently has to be generated with two separate droidstubs instances,
one to generate the stubs and another to generate the .txt file. This
allows the module generating the .txt file to avoid also wasting time
generating stubs that are not used.

This change:
* Adds a generate_stubs property that defaults to true to allow the
  behavior to be customized on a per module basis.
* Uses either the stubs srcjar or the api .txt file as the OutputFile
  for the AndroidMkEntries to ensure that they get written out properly.
* Rearranges the code for generating stubs to make it easier to
  turn it off.

Bug: 146727827
Test: m droid
      Check output dir of framework-sdkextensions-api-module_libs_api
	  to make sure it does not contain any sources or srcjars.
Change-Id: Ib8025019f8a7a8cf5fa8765d76b5ad470af20006
2020-04-08 18:50:37 +01:00
Chih-Hung Hsieh
3d3df826c1 Disable bugprone-reserved-identifier
* Disable it for the next clang compiler update
  until all source files with this warning are fixed.

Bug: 153464409
Test: WITH_TIDY=1 make
Change-Id: I126d2f5170f3883192348577e523ef99f5c5a70e
2020-04-08 10:42:16 -07:00
Treehugger Robot
9e06bb64ca Merge "Make the names of 'soong_config_module_type_import' modules unique." 2020-04-08 17:39:42 +00:00
Stephen Hines
719ea2b849 Merge "Switch to clang-r377782d (10.0.6)." 2020-04-08 17:39:19 +00:00
Ulyana Trafimovich
bac0c9dc97 Merge "Relax boot image check to allow platform Jacoco variant in a coverage build." am: 82aca76739 am: a0e1d71939
Change-Id: I16e5694fe9b8fdf0443d775447b51297f7500796
2020-04-08 17:25:08 +00:00
Ulyana Trafimovich
78b2dc694f Merge "Relax boot image check to allow platform Jacoco variant in a coverage build." am: 82aca76739 am: a0e1d71939
Change-Id: Id229444b0d859d7db624fa86d493d549b92ecd9f
2020-04-08 17:24:40 +00:00
Ulyana Trafimovich
a0e1d71939 Merge "Relax boot image check to allow platform Jacoco variant in a coverage build." am: 82aca76739
Change-Id: I6743cc208b1f5a28f0921c158e070d89acd80ba5
2020-04-08 17:12:51 +00:00
Ulyana Trafimovich
82aca76739 Merge "Relax boot image check to allow platform Jacoco variant in a coverage build." 2020-04-08 16:56:10 +00:00
Jooyung Han
f8300fdce1 Apex: add NeverAllowRule for updatable am: e17caa63a6
Change-Id: Ie893bf23a57083b594cd0fc5c09adb7a38322969
2020-04-08 15:56:17 +00:00
Paul Duffin
41f30885b4 Merge "Ignore PrebuiltDepTag when processing APEX contents" am: 846e60dbc7 am: 246bbcc5e2
Change-Id: I82ef5f1538fcd7f3554623350a6e20e8d1e924c9
2020-04-08 14:59:27 +00:00
Paul Duffin
2842d14c50 Merge "Ignore PrebuiltDepTag when processing APEX contents" am: 846e60dbc7 am: 246bbcc5e2
Change-Id: Ia5482682e8673cd0721c6029d03e222a9e0aefe1
2020-04-08 14:59:24 +00:00
Paul Duffin
716fa29758 Merge "Stop requiring apex_available on java_library members of sdks" am: f76c64018e am: c8c4a962d4
Change-Id: Ibfe803b5343a12b91eac726ff2bbb4ede13f4808
2020-04-08 14:59:16 +00:00
Paul Duffin
3e5c8b4995 Merge "Stop requiring apex_available on java_library members of sdks" am: f76c64018e am: c8c4a962d4
Change-Id: I8655a0889bb8bb089e16107ec29a1c559cb290b0
2020-04-08 14:59:16 +00:00
Paul Duffin
246bbcc5e2 Merge "Ignore PrebuiltDepTag when processing APEX contents" am: 846e60dbc7
Change-Id: Ic0f43434fc9e0c503c3b5a1e91de03f66844831a
2020-04-08 14:40:36 +00:00
Paul Duffin
c8c4a962d4 Merge "Stop requiring apex_available on java_library members of sdks" am: f76c64018e
Change-Id: I8b8519220ebf6de6e653812cb27d50665f4c955d
2020-04-08 14:40:23 +00:00
Paul Duffin
846e60dbc7 Merge "Ignore PrebuiltDepTag when processing APEX contents" 2020-04-08 14:28:47 +00:00
Paul Duffin
f76c64018e Merge "Stop requiring apex_available on java_library members of sdks" 2020-04-08 14:26:39 +00:00