Commit Graph

19336 Commits

Author SHA1 Message Date
Treehugger Robot
ec1c252f7b Merge changes If74eea67,I9d8089b2 am: 522bca3b26
Change-Id: I1800ea6f7bdbc5847917ca78e71f5fec4b504398
2020-04-09 17:04:56 +00:00
Paul Duffin
d1053dd94a Merge "Generate struct with field for each api scope" am: f9cb1204e1
Change-Id: I3c0ca96e296050a7db2f8fd4d59894eeffa4317d
2020-04-09 17:04:47 +00:00
Treehugger Robot
522bca3b26 Merge changes If74eea67,I9d8089b2
* changes:
  Extract createJavaImportForStubs()
  Support java_sdk_library as member of sdk
2020-04-09 17:01:51 +00:00
Paul Duffin
f9cb1204e1 Merge "Generate struct with field for each api scope" 2020-04-09 17:01:40 +00:00
Yi Kong
824cfb7f25 Merge "Pass -Brepro ldflag to Windows builds" am: 2ae41725b5
Change-Id: I2270d5330c5febe39f25776c8cfeea4d3e75d973
2020-04-09 16:58:33 +00:00
Jaewoong Jung
2ba7dd47d3 Merge "Collect JNI coverage data only for first target." am: 9b38447d48
Change-Id: Id1983335a401c3cbbbbcb237b6fdcee93d99cfaa
2020-04-09 16:58:25 +00:00
Yi Kong
2ae41725b5 Merge "Pass -Brepro ldflag to Windows builds" 2020-04-09 16:50:23 +00:00
Jaewoong Jung
9b38447d48 Merge "Collect JNI coverage data only for first target." 2020-04-09 16:42:34 +00:00
Paul Duffin
6931de02de Merge "Allow droidstubs to not generate any stubs" am: e03749b9ad
Change-Id: I709eb7a5eec97b5135ba502964d06b6c18bd6bfe
2020-04-09 15:56:49 +00:00
Paul Duffin
e03749b9ad Merge "Allow droidstubs to not generate any stubs" 2020-04-09 15:42:07 +00:00
Jaewoong Jung
46984eeb58 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.

(This is a cherry-pick change.)

Bug: 153461674
Test: Built cts with the coverage flags set.
Change-Id: Ibb8da6e9c112a857695cd7095a62c910cddfbb94
Merged-In: Ibb8da6e9c112a857695cd7095a62c910cddfbb94
2020-04-09 08:32:40 -07:00
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
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
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
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
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
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
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
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
Ulya Trafimovich
e0ce4ba491 Relax boot image check to allow platform Jacoco variant in a coverage build.
Test: m nothing
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true nothing

Bug: 153533941

Change-Id: I5847ec282f6b481cee61ed9ec6b6928c9a41fae7
2020-04-08 15:11:20 +01:00
Ivan Lozano
ce7452eaf6 Merge "Fix incorrect Rust installation paths." am: 5d7be45a2b
Change-Id: I1c319a3af25acbffba0f9d7288301f1eeb3da04b
2020-04-08 12:29:40 +00:00
Ivan Lozano
5b0eb8b750 Merge "Add crtbegin_so/crtend_so to Bionic Rust libraries." am: 526291abe4
Change-Id: I7df9cf20b2eb3007e3c75dd058104f8a0a1265c7
2020-04-08 12:29:34 +00:00
Ulyana Trafimovich
73864e0b04 Merge "Forbid generating boot image files for jars in updatable modules." am: 0d8f61640e
Change-Id: Ic7d5de766a06383288aceac25ef76bcdb9b3ac6e
2020-04-08 12:29:10 +00:00
Ivan Lozano
5d7be45a2b Merge "Fix incorrect Rust installation paths." 2020-04-08 12:27:34 +00:00
Ivan Lozano
526291abe4 Merge "Add crtbegin_so/crtend_so to Bionic Rust libraries." 2020-04-08 12:26:11 +00:00
Ulyana Trafimovich
0d8f61640e Merge "Forbid generating boot image files for jars in updatable modules." 2020-04-08 12:15:47 +00:00
Paul Duffin
e554326df5 Add dependency tags to apex available errors am: c519244cd5
Change-Id: Ie01421c837b52a9ab314c2163e34f1a57c2afdf3
2020-04-08 11:28:21 +00:00
Stephen Hines
883a0fdfd9 Switch to clang-r377782d (10.0.6).
Bug: http://b/153164546
Test: Built aosp_blueline successfully. Kernel also verified without
needing workarounds from LLD crash.

Change-Id: I41ae5a5be0065da98dd941b16196a3f4888b86b1
2020-04-08 02:22:57 -07:00
Paul Duffin
dddd5469ad Ignore PrebuiltDepTag when processing APEX contents
When a source and a prebuilt module are present in the same build a
dependency is added from the source module to the prebuilt module.
Previously, the code for generating the APEX did not recognize that
tag and in some cases (e.g. for cc_(prebuilt_)library_shared) will
fail the build.

This change:
1) Adds a test to reproduce the problem.
2) Improves the debug message by pretty printing the tag.
3) Adds a new ExcludeFromApexContents interface that can be implemented
   by a tag to declare that it should be excluded from the APEX
   contents.
4) Ignores tags that implement that interface when generating APEX
   contents.
5) Implements that interface on prebuiltDependencyTag to fix the
   test.

Bug: 153326844
Test: m nothing
Change-Id: I9dd4312c4f995c816c0a31d8d733eb5d7f56e1ea
2020-04-08 08:40:44 +01:00
Paul Duffin
6534770793 Stop requiring apex_available on java_library members of sdks
Previously, adding java_library to an sdk required that the names of
any APEXes that transitively compiled against it were added to its
apex_available property. This change removes that requirement.

Also corrects the dependency path in the TestApexAvailable_IndirectDep
error which previously passed through "shared from static" static
dependency tags even though those are explicitly NOT followed when
checking apex_available settings.

Bug: 152878661
Test: m droid
Change-Id: I995ed38956c1bc210b09494812de012fed9f9232
2020-04-08 08:40:44 +01:00
Paul Duffin
c519244cd5 Add dependency tags to apex available errors
Having dependency tags in the dependency path that shows why a specific
module is considered part of an apex makes it easier to understand why
that is the case and detect possible issues.

Bug: 152762638
Test: m nothing
Change-Id: Iba2a8a5a6abe03dadee456e760aa4373cd00c07b
2020-04-08 08:40:44 +01:00
Paul Duffin
2a9b7c8791 Merge "Extract DepIsInSameApex and RequiredSdks interfaces" am: 2010598a51
Change-Id: I2a32d1dcdfbf486d3f583665ce8b0608d599dc07
2020-04-08 07:11:17 +00:00
Paul Duffin
2010598a51 Merge "Extract DepIsInSameApex and RequiredSdks interfaces" 2020-04-08 06:55:03 +00:00