Commit Graph

19805 Commits

Author SHA1 Message Date
Greg Kaiser
010e45aa06 Merge changes from topic "revert-1302576-NGVCIVIIJO" am: a71fe150fa
Change-Id: I15f6aac5b844116a9b886db7a512d18c9ce9d065
2020-05-08 19:35:11 +00:00
Greg Kaiser
a71fe150fa Merge changes from topic "revert-1302576-NGVCIVIIJO"
* changes:
  Revert "Detect invalid arch specific properties in snapshot"
  Revert "Adds support for 'ignored-on-host'"
  Revert "Fix snapshot of a host/device cc_library with stubs"
2020-05-08 19:18:40 +00:00
Greg Kaiser
e509447c93 Revert "Detect invalid arch specific properties in snapshot"
Revert submission 1302576

Bug: 156054601
Reason for revert: Presumed root cause of build break.
Reverted Changes:
Ifc8116e11:Detect invalid arch specific properties in snapsho...
I7ebd33307:Adds support for 'ignored-on-host'
I167b47a13:Fix snapshot of a host/device cc_library with stub...

Change-Id: Id7eba0bdde5c579e10e9b42d94a7cfab5f34995f
2020-05-08 19:12:34 +00:00
Greg Kaiser
e08e03fa96 Revert "Adds support for 'ignored-on-host'"
Revert submission 1302576

Bug: 156054601
Reason for revert: Presumed root cause of build break.
Reverted Changes:
Ifc8116e11:Detect invalid arch specific properties in snapsho...
I7ebd33307:Adds support for 'ignored-on-host'
I167b47a13:Fix snapshot of a host/device cc_library with stub...

Change-Id: I2a7ac0ef0232177eefc26542c11dc675d6f4cab2
2020-05-08 19:12:34 +00:00
Greg Kaiser
ad913d56ac Revert "Fix snapshot of a host/device cc_library with stubs"
Revert submission 1302576

Bug: 156054601
Reason for revert: Presumed root cause of build break.
Reverted Changes:
Ifc8116e11:Detect invalid arch specific properties in snapsho...
I7ebd33307:Adds support for 'ignored-on-host'
I167b47a13:Fix snapshot of a host/device cc_library with stub...

Change-Id: Ibccce5286605bb71c6be3b3550ba86d8b7e24fa7
2020-05-08 19:12:34 +00:00
Liz Kammer
afcf1b4472 Merge "Add androidmk support for runtime_resource_overlay" am: 50fc599bbc
Change-Id: I2295006b81adef0fa05d35bb7155d3dbb7bcf3e5
2020-05-08 18:25:30 +00:00
Liz Kammer
50fc599bbc Merge "Add androidmk support for runtime_resource_overlay" 2020-05-08 18:07:01 +00:00
Paul Duffin
99766c6c5d Merge "java_sdk_library: Add support for module_lib API surface" am: f49f431c33
Change-Id: Ie4cf102108a4944f0741e9765dd5268d8ce9ec3f
2020-05-08 17:31:07 +00:00
Paul Duffin
60f68973a9 Merge "java_sdk_library: Control API surfaces generated" am: d34bc09aa1
Change-Id: I5d02d25e2d6ef000baafcafc623f63f963d0a456
2020-05-08 17:30:57 +00:00
Paul Duffin
f49f431c33 Merge "java_sdk_library: Add support for module_lib API surface" 2020-05-08 17:02:37 +00:00
Paul Duffin
d34bc09aa1 Merge "java_sdk_library: Control API surfaces generated" 2020-05-08 17:01:50 +00:00
Daniel Norman
236a82786a Merge "Removes $(PRODUCT_OUT)/misc_info.txt on installclean." am: ad521eeb14
Change-Id: I8bf0a5c446e66f75b2d133b747e73b30e0d67779
2020-05-08 16:36:45 +00:00
Daniel Norman
ad521eeb14 Merge "Removes $(PRODUCT_OUT)/misc_info.txt on installclean." 2020-05-08 16:22:59 +00:00
Jiyong Park
a3c8a7d511 Merge "Revert "Prevent statically linking to a lib providing stable C APIs"" am: 18bbde1615
Change-Id: I6cd7ae09581273a917c31263403d8a19fc7ba735
2020-05-08 08:22:46 +00:00
Jiyong Park
18bbde1615 Merge "Revert "Prevent statically linking to a lib providing stable C APIs"" 2020-05-08 08:11:24 +00:00
Jiyong Park
5b75774004 Revert "Prevent statically linking to a lib providing stable C APIs"
This reverts commit 45b90e79c9.

Reason for revert: breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=run_bluetooth_host_native_tests&lkgb=6474123&lkbb=6474183&fkbb=6474137

Bug: 156046846
Change-Id: I0df395eaa4cd856ab466925031b21aa4adc3af08
Test: m on full-eng
2020-05-08 07:55:47 +00:00
Paul Duffin
8f265b9ab9 java_sdk_library: Add support for module_lib API surface
Adds api scope for the module_lib and adds that to the list of all
all available scopes. The scope is generated if and only if the
api_surfaces property contains "module_lib".

No other changes are needed as the generation of the APIs is completely
driven by the allApiScopes array and the information in its contained
apiScope structures.

Test: m checkapi
Bug: 155164730
Change-Id: I7769af6823badca8715a270f86cf53b4e954b7df
2020-05-08 07:51:00 +01:00
Paul Duffin
3375e35d99 java_sdk_library: Control API surfaces generated
Adds a per scope set of properties that allows explicit control over
the API surfaces generated.

Previously, the term active was used to determine whether it was
generated but that was a little abstract and unclear so has been
replaced by generated.

Test: m nothing
Bug: 155164730
Change-Id: I7539d89618b61f6b9d1a4b60cc3f9614b157f0d9
2020-05-08 07:51:00 +01:00
Jiyong Park
36a0125014 Merge changes from topic "no_staticlinking_to_stubs" am: 06938a0a16
Change-Id: Iaa76d24dc4d1867c2daa25130ad4c607cceb036a
2020-05-08 02:35:14 +00:00
Jiyong Park
abf09b50e4 Add GetPathString am: 1c7e962957
Change-Id: Iada405f160d8178ec90a1634f22a50cb18215938
2020-05-08 02:35:11 +00:00
Jiyong Park
06938a0a16 Merge changes from topic "no_staticlinking_to_stubs"
* changes:
  Prevent statically linking to a lib providing stable C APIs
  Add GetPathString
2020-05-08 02:12:58 +00:00
Daniel Norman
b8e7f81af6 Removes $(PRODUCT_OUT)/misc_info.txt on installclean.
misc_info.txt's build rule does not contain inputs to tell it to
refresh on an incremental build, so incremental builds (even after
installclean) were reusing this file.

With this change, misc_info.txt is removed by installclean so that an
incremental build generates the file fresh.

Test: # misc_info.txt exists; m installclean; # misc_info.txt gone
Bug: 155930200
Change-Id: Ia319925dad26f98049a988ee1ceb1e20db621353
2020-05-07 23:48:30 +00:00
Paul Duffin
4b99ceccd6 Merge changes I167b47a1,I7ebd3330,Ifc8116e1 am: af6fbcbcca
Change-Id: I880559ccaa54c4d4e32e0389148c0c1e864aeb4f
2020-05-07 22:09:03 +00:00
Paul Duffin
af6fbcbcca Merge changes I167b47a1,I7ebd3330,Ifc8116e1
* changes:
  Fix snapshot of a host/device cc_library with stubs
  Adds support for 'ignored-on-host'
  Detect invalid arch specific properties in snapshot
2020-05-07 21:58:14 +00:00
Treehugger Robot
a7f446af4a Merge "Skip dexpreopting android_test_import modules" am: cf23ab4cd8
Change-Id: Ic9ec152d8c1a28dc9553323ae81058c90c062a3b
2020-05-07 21:48:08 +00:00
Liz Kammer
74151f2c8c Add androidmk support for runtime_resource_overlay
Test: androidmk_test.go
Bug: 148673525
Change-Id: I25c277c52b91e9308e15d92364b5504a8f556c9f
2020-05-07 14:40:57 -07:00
Treehugger Robot
cf23ab4cd8 Merge "Skip dexpreopting android_test_import modules" 2020-05-07 21:37:37 +00:00
Treehugger Robot
7cd5ce4e59 Merge "Switch java_sdk_library to use SetDefaultableHook()" am: 3d60daadbc
Change-Id: Id0447311a043f0e46930ab1dfbb300979e109199
2020-05-07 20:48:27 +00:00
Treehugger Robot
3d60daadbc Merge "Switch java_sdk_library to use SetDefaultableHook()" 2020-05-07 20:39:05 +00:00
Colin Cross
c80828d567 Skip dexpreopting android_test_import modules
android_test_import modules should be labelled as tests so they are
not dexpreopted.

Bug: 155778135
Test: m CtsCorruptApkTests_Compressed_Q
Change-Id: I7baa5405d03df03920b01616b030ba77f882a77e
2020-05-07 12:06:14 -07:00
Colin Cross
5ac0b15211 Merge "Add jni_uses_sdk_apis" am: 7500f46b95
Change-Id: I985d088f671e41ae4a216b8cee0af3800aa92606
2020-05-07 18:13:29 +00:00
Colin Cross
7500f46b95 Merge "Add jni_uses_sdk_apis" 2020-05-07 18:09:47 +00:00
Colin Cross
7204cf0e6a Add jni_uses_sdk_apis
NetworkStackTests is using platform APIs for its Java code, but needs
to use portable JNI libraries.  Add a jni_uses_sdk_apis so that it
can select the SDK variants of JNI libraries even though it doesn't
set sdk_version.

(clean cherry-pick from internal branch)
Bug: 154665579
Test: atest NetworkStackTests
Merged-In: I841fb761ec1c1ab8596aac44e01eb7eb91428006
Change-Id: I841fb761ec1c1ab8596aac44e01eb7eb91428006
2020-05-07 18:09:06 +00:00
Ivan Lozano
acdf2ac701 Merge "Add gcov coverage support to Rust modules." am: 6c4e5c05c3
Change-Id: I9f998821818e30e427696cdbcb3121722a2c8f56
2020-05-07 18:07:50 +00:00
Ivan Lozano
6c4e5c05c3 Merge "Add gcov coverage support to Rust modules." 2020-05-07 17:56:43 +00:00
Paul Duffin
2af52380be Fix snapshot of a host/device cc_library with stubs
Adds a test that fails with unknown property android.stubs.versions
and then fixes that by marking the field from which that property is
created with 'ignored-on-host' and implemented the isHostVariant on
*osTypeSpecificInfo.

Bug: 155628860
Test: m nothing
Change-Id: I167b47a1374f541aa09d7e045972d740f1d9009c
2020-05-07 18:35:11 +01:00
Paul Duffin
12f67bcf42 Adds support for 'ignored-on-host'
Adds a filter mechanism that can exclude property values from being
included in the common value extraction. That is needed to prevent the
snapshot mechanism from generating invalid output for properties that
are ignored on host (and have their values cleared) and which are not
tagged with `android:"arch_variant"`.

Changes:
* Updates the documentation of SdkMemberType to explain what effect
  the 'ignored-on-host' tag has.
* Adds some tests for this new mechanism.

Bug: 155628860
Test: m nothing
Change-Id: I7ebd333079619dba546bc8c4911d567e0287b676
2020-05-07 18:35:11 +01:00
Paul Duffin
ee20962378 Detect invalid arch specific properties in snapshot
Previously, the snapshot code did not know whether a specific property
could be arch specific or not and assumed that they all were which
meant that it could generate snapshots containing arch specific values
for properties that are not arch specific and so would fail when
unpacked.

This change requires arch specific fields in SdkMemberProperties to be
tagged as such using `android:"arch_variant"` (just as in module input
property structures). Any property without that must have properties
that are common across all variants.

Bug: 155628860
Test: m nothing
Change-Id: Ifc8116e11d987cfe7aec2eeaa964f3bbf36b5dc2
2020-05-07 18:35:11 +01:00
Paul Duffin
01d23134f2 Merge "Allow extractCommonProperties to return an error" am: bd7e3295dd
Change-Id: Iab5fbb31db1ce9bdb7d4a4558e051f2b6df7d830
2020-05-07 16:28:41 +00:00
Paul Duffin
bd7e3295dd Merge "Allow extractCommonProperties to return an error" 2020-05-07 16:17:42 +00:00
Paul Duffin
6b178d6f7b Merge changes If673d482,I98b575b8 am: 38e2fbdc90
Change-Id: I0c0d1d5da191d6684f1fc40c57eeb224d8f2588e
2020-05-07 16:00:37 +00:00
Paul Duffin
38e2fbdc90 Merge changes If673d482,I98b575b8
* changes:
  Remove reference to obsolete BuildSnapshot()
  Correct order of parameters to AssertDeepEquals
2020-05-07 15:50:06 +00:00
Treehugger Robot
6bc155429e Merge "Remove implicit Bionic and kernel system includes." am: 4779327cf8
Change-Id: I72a5de7f105d062ca98c3d2d64d62aad2fcbdbb1
2020-05-07 13:44:33 +00:00
Treehugger Robot
4779327cf8 Merge "Remove implicit Bionic and kernel system includes." 2020-05-07 13:35:13 +00:00
Jeongik Cha
253c607f14 Merge "Remove networkstack-aidl-interfaces-unstable-java from the whitelist" am: 9d902cef58
Change-Id: I516d5b52588f7d0653835758f9b6073316eb372a
2020-05-07 11:12:50 +00:00
Jeongik Cha
9d902cef58 Merge "Remove networkstack-aidl-interfaces-unstable-java from the whitelist" 2020-05-07 10:59:05 +00:00
Treehugger Robot
dd80c5f12c Merge "Reduce the number of Soong invocations, and various other minor script fixes." am: d9e4bf9840
Change-Id: I52c67cf6ffe83a0759da97e1fa3fca9c2682c695
2020-05-07 10:48:59 +00:00
Treehugger Robot
d9e4bf9840 Merge "Reduce the number of Soong invocations, and various other minor script fixes." 2020-05-07 10:36:54 +00:00
Treehugger Robot
e04534cd62 Merge "java_sdk_library: Define relationship between api scopes" am: aa71638941
Change-Id: Ia704d3ba4157806f8b901f4b54279f4c5525f675
2020-05-07 09:45:36 +00:00
Treehugger Robot
aa71638941 Merge "java_sdk_library: Define relationship between api scopes" 2020-05-07 09:37:54 +00:00