Commit Graph

21310 Commits

Author SHA1 Message Date
Treehugger Robot
3f18c55cc0 Merge "Fix missing NOTICE targets for static libs that aren't available to platform." am: e152ada4e7 am: b7c30e8a0c
Change-Id: If72192000b2eb215dec0f793db63fcec61fc9f49
2020-04-14 14:20:08 +00:00
Treehugger Robot
b7c30e8a0c Merge "Fix missing NOTICE targets for static libs that aren't available to platform." am: e152ada4e7
Change-Id: I2be6190f825840e9d2bddf130c547bd608eeb1db
2020-04-14 13:55:26 +00:00
Treehugger Robot
e152ada4e7 Merge "Fix missing NOTICE targets for static libs that aren't available to platform." 2020-04-14 13:43:46 +00:00
TreeHugger Robot
7e35069f41 [automerger skipped] Merge "Clean com.android.neuralnetworks APEX whitelist" into rvc-dev am: 89030a315a -s ours
am skip reason: Change-Id I1babea6c221dec1cd5364250d09f5ea541494942 with SHA-1 5642308998 is in history

Change-Id: Iead5f71250e4e26c95e9afd8720836c482b46e03
2020-04-14 12:34:37 +00:00
TreeHugger Robot
89030a315a Merge "Clean com.android.neuralnetworks APEX whitelist" into rvc-dev 2020-04-14 12:21:42 +00:00
Jooyung Han
b3650211b9 apex: remove compat symlinks to vndk apex am: 84026389e7
Change-Id: I3cd02a9bce9ade0bcc5c418616bc5009205953a4
2020-04-14 09:19:36 +00:00
Jooyung Han
84026389e7 apex: remove compat symlinks to vndk apex
For R+, symlinks from /system/lib to VNDK APEX are not necessary. (Note
that, symlinks to older VNDK are still necessary because older vendor
may access old locations.)

Hence, do not make symlinks for R+ VNDK APEX.

Bug: 142911355
Test: m # check /system/lib[64]/ for symlinks
        # cf should contain 28/29 symlinks but no symlinks for R
Change-Id: I852fad7edebed3e4edc03c374b3643da6b053fed
2020-04-14 14:22:31 +09:00
Jooyung Han
9f88bfa5f4 [automerger skipped] Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" am: e5fce6cdbf am: b9c19ad4a8 -s ours
am skip reason: Change-Id I78ca88758998e440bea72ba2d56d90eea3ec99ae with SHA-1 424175d72a is in history

Change-Id: I9ea79827063dfc61beb90c8f29a2bd8d8843814b
2020-04-14 04:41:20 +00:00
Jooyung Han
b9c19ad4a8 Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" am: e5fce6cdbf
Change-Id: I22f220d063b5f814d5601b114b97454f4fed43ad
2020-04-14 04:21:42 +00:00
Jooyung Han
e5fce6cdbf Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" 2020-04-14 04:00:03 +00:00
Jiyong Park
fbd9909696 [automerger skipped] Don't allow a lib having stubs to become a member of VNDK am: be024ad673 -s ours
am skip reason: Change-Id Id305196a9d5a6fc7e7f9c02f3fa076859dc9a282 with SHA-1 ea97f51a29 is in history

Change-Id: Ib58b6537153a52d41a1744c7394d73b8a1c29d00
2020-04-14 02:41:07 +00:00
Jooyung Han
03302eee13 Remove PLATFORM_VERSION_FUTURE_CODENAMES
It has been wrong to split ALL_VERSIONS into exclusive two sets of
before/after TARGET_PLATFORM_VERSION.

And PLATFORM_VERSION_ALL_CODENAMES supports all *active* list of
non-finalized codenames.

Bug: 152960049
Test: m
Exempt-From-Owner-Approval: cp from master
Merged-In: I78ca88758998e440bea72ba2d56d90eea3ec99ae
Change-Id: I78ca88758998e440bea72ba2d56d90eea3ec99ae
(cherry picked from commit 424175d72a)
2020-04-14 02:06:57 +00:00
Ivan Lozano
7fd6de7863 Merge "Remove rust execute-only memory linker flag." am: 0b14d0f500 am: a64ebd94b2
Change-Id: I7d76ba6b79827593896498f5fcd6560e901269d6
2020-04-13 18:13:19 +00:00
Ivan Lozano
a64ebd94b2 Merge "Remove rust execute-only memory linker flag." am: 0b14d0f500
Change-Id: Idb14db7f3212ad61b4d99e65fdfac2137fc761c7
2020-04-13 17:50:12 +00:00
Ivan Lozano
0b14d0f500 Merge "Remove rust execute-only memory linker flag." 2020-04-13 17:35:32 +00:00
Jaewoong Jung
250b32dde4 [automerger skipped] Merge "Add libs properties to runtime_resource_overlay." am: f472871e00 am: 74c33dcf30 -s ours
am skip reason: Change-Id I723c7175760da019d38893e54f236c45f4c973ea with SHA-1 ca095d786a is in history

Change-Id: Ifa7949ffbb44aeb64abfa2c4a9dfe70b8e554356
2020-04-13 14:15:00 +00:00
Jaewoong Jung
74c33dcf30 Merge "Add libs properties to runtime_resource_overlay." am: f472871e00
Change-Id: I35558bc2edfcdfe2c77213d2a2f833876cd2d162
2020-04-13 13:55:51 +00:00
Jaewoong Jung
f472871e00 Merge "Add libs properties to runtime_resource_overlay." 2020-04-13 13:27:25 +00:00
Treehugger Robot
47404a61d5 Merge "Don't allow a lib having stubs to become a member of VNDK" am: 624dec0b03 am: 5cb3f62fee
Change-Id: I57a67d58f432a9a3131cd9a71ba5ec2e4dbac0f5
2020-04-13 04:39:36 +00:00
Treehugger Robot
5cb3f62fee Merge "Don't allow a lib having stubs to become a member of VNDK" am: 624dec0b03
Change-Id: Ifecd74fdccb79e9b9e5a35c2e5c4d8443c3e799b
2020-04-13 04:21:35 +00:00
Jiyong Park
be024ad673 Don't allow a lib having stubs to become a member of VNDK
If a lib has stubs, that means the library provides stable C APIs and
the APIs are guaranteed to be maintained in a backwards compatible
manner. Then there is no reason to have the same library in VNDK,
because VNDK is for libraries (usually having C++ interfaces) where API
stability across the yearly releases is hard (or impossible) to be
guaranteed.

This change triggers an error when the build system finds a VNDK lib
which has stubs defined. Users are suggested to make the lib an LLNDK
one.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 151303316
Test: m
Merged-In: Id305196a9d5a6fc7e7f9c02f3fa076859dc9a282
(cherry picked from commit ea97f51a29)
Change-Id: Id305196a9d5a6fc7e7f9c02f3fa076859dc9a282
2020-04-13 13:08:16 +09:00
Treehugger Robot
624dec0b03 Merge "Don't allow a lib having stubs to become a member of VNDK" 2020-04-13 04:05:31 +00:00
Treehugger Robot
5c4f8048a6 [automerger skipped] Merge "Create prebuilt api modules in load hook not mutator" am: aba65adbbf am: 8304acc420 -s ours
am skip reason: Change-Id Id44dce8ca9968ae903345df6ef1c4f1be9cb76c5 with SHA-1 47f6315f01 is in history

Change-Id: I152a9e38bf6abaa4622734c4dbecc3b7835f2fd1
2020-04-11 19:35:12 +00:00
Treehugger Robot
8304acc420 Merge "Create prebuilt api modules in load hook not mutator" am: aba65adbbf
Change-Id: I99a528d0d2d9c76cdfbbe27ee1167f2c64d3a8bd
2020-04-11 19:01:51 +00:00
Treehugger Robot
aba65adbbf Merge "Create prebuilt api modules in load hook not mutator" 2020-04-11 18:40:07 +00:00
TreeHugger Robot
770fd0865a [automerger skipped] Merge "soong config: add value_variable substitution" into rvc-dev am: a59774eb49 -s ours
am skip reason: Change-Id I18f35746b5cc39c304a136980249e886d38c6df6 with SHA-1 b0935db8c3 is in history

Change-Id: I2742f3949baf137f5833fa0012fd6fc821b7a737
2020-04-11 17:40:14 +00:00
TreeHugger Robot
a59774eb49 Merge "soong config: add value_variable substitution" into rvc-dev 2020-04-11 17:24:57 +00:00
Jaewoong Jung
fe3c7f6261 Add libs properties to runtime_resource_overlay.
(This is a cherry-pick change.)

Test: app_test.go
Test: Converted an existing RRO module.
Bug: 148788111
Change-Id: I723c7175760da019d38893e54f236c45f4c973ea
Merged-In: I723c7175760da019d38893e54f236c45f4c973ea
2020-04-10 16:29:40 -07:00
TreeHugger Robot
6c4ba7cda3 [automerger skipped] Merge "Make the names of 'soong_config_module_type_import' modules unique." into rvc-dev am: a6ffd8b141 -s ours
am skip reason: Change-Id I6782e42c129dc3b0fc7649ce97d5f94effc63fa7 with SHA-1 116ec92e0e is in history

Change-Id: Ic145ae203ad235a6c4c068505dc73af9d9c58355
2020-04-10 21:28:17 +00:00
TreeHugger Robot
a6ffd8b141 Merge "Make the names of 'soong_config_module_type_import' modules unique." into rvc-dev 2020-04-10 21:09:21 +00:00
Sasha Smundak
227d5675c5 Make the names of 'soong_config_module_type_import' modules unique.
blueprint.writeAllModuleActions attemts to sort modules by name, and
sorting them assumes that each module's name is unique. Although
soong_config_module_type_import modules will not generate anything,
their names should be unique, too for that reason.

Fixes: 150421585
Test: m nothing
Change-Id: I6782e42c129dc3b0fc7649ce97d5f94effc63fa7
Merged-In: I6782e42c129dc3b0fc7649ce97d5f94effc63fa7
2020-04-10 13:54:07 -07:00
Anton Hansson
ddf1ff51ec [automerger skipped] Merge "Expand neverallow for sdk_version: none" into rvc-dev am: 846101ace0 -s ours
am skip reason: Change-Id Icaece0d9797bace8ae9741f7a029b9ea57fcbbb9 with SHA-1 453764070d is in history

Change-Id: Ia6732b5ae9560b157c94f70bdf174873298eee14
2020-04-10 18:58:19 +00:00
Anton Hansson
846101ace0 Merge "Expand neverallow for sdk_version: none" into rvc-dev 2020-04-10 18:53:30 +00:00
Jaewoong Jung
5209b4bd9f Merge "Add libs properties to runtime_resource_overlay." into rvc-dev am: 1883126573
Change-Id: I74d3bacdeefefd2736448164841081668c714072
2020-04-10 18:06:40 +00:00
Jaewoong Jung
1883126573 Merge "Add libs properties to runtime_resource_overlay." into rvc-dev 2020-04-10 17:41:19 +00:00
Anton Hansson
5b0653f6a3 Merge "Expand neverallow for sdk_version: none" am: d0615e7019 am: a5e3580508
Change-Id: Iea306d730241cf0bff2ea1264944a06739a8014c
2020-04-10 14:36:24 +00:00
Anton Hansson
a5e3580508 Merge "Expand neverallow for sdk_version: none" am: d0615e7019
Change-Id: I7adaef496bc5d4098341c4338e7fbae7272277ee
2020-04-10 14:17:31 +00:00
Jaewoong Jung
ca095d786a Add libs properties to runtime_resource_overlay.
Test: app_test.go
Test: Converted an existing RRO module.
Bug: 148788111
Change-Id: I723c7175760da019d38893e54f236c45f4c973ea
2020-04-10 07:05:07 -07:00
Anton Hansson
fec6c23734 Expand neverallow for sdk_version: none
Allow the platform stubs to specify sdk_version: none,
and add generic support for a regexp matcher.

Bug: 144149403
Test: m
Change-Id: Icaece0d9797bace8ae9741f7a029b9ea57fcbbb9
Merged-In: Icaece0d9797bace8ae9741f7a029b9ea57fcbbb9
2020-04-10 15:02:35 +01:00
Anton Hansson
d0615e7019 Merge "Expand neverallow for sdk_version: none" 2020-04-10 14:00:16 +00:00
Yabin Cui
cf3e46dc77 Merge "Disable cert-dcl51-cpp and -cert-dcl37-c." am: bb5ee50e29 am: e9cc2985c4
Change-Id: I6ab31fbafaf2b5c601251fc4c76791c0b6e7ec6a
2020-04-10 06:52:59 +00:00
Paul Duffin
d4c0356dad Create prebuilt api modules in load hook not mutator
An attempt to reference one of the prebuilt modules directly from an
Android.bp file highlighted a bug. The prebuilt_apis module used a
mutator to create filegroup and java_import modules for a set of api
versions. That mutator ran after the "prebuilts" mutator which handled
the renaming of prebuilt modules when the matching source module was
not present. That meant that the only way to reference the module was
by explicitly adding the prefix "prebuilt_".

This change fixed that bug by creating the modules in a load hook rather
that a mutator. This ensures that the prebuilt modules are present well
before the "prebuilts" mutator is run. Removing the mutator also removes
an unnecessary traversal of the whole dependency tree.

It also updated the documentation to explain that it creates
java_import modules as well as the filegroup modules.

(cherry picked from 47f6315f01)

Bug: 153649372
Test: m droid
Change-Id: Id44dce8ca9968ae903345df6ef1c4f1be9cb76c5
Merged-In: Id44dce8ca9968ae903345df6ef1c4f1be9cb76c5
2020-04-10 07:44:52 +01:00
Yi Kong
ba6966b59a [automerger skipped] Merge "Pass -Brepro ldflag to Windows builds" into rvc-dev am: 343eae73b7 -s ours
am skip reason: Change-Id I38fe993eec23c60bfcf1b76188774bfe06839fa4 with SHA-1 a3c22e7ee2 is in history

Change-Id: I52ac74c930be3870162b2aa3fb9dad4943dec274
2020-04-10 06:33:28 +00:00
Yabin Cui
e9cc2985c4 Merge "Disable cert-dcl51-cpp and -cert-dcl37-c." am: bb5ee50e29
Change-Id: Id40937fb683c69408c3bb9c3cce4b45ba42081aa
2020-04-10 06:31:13 +00:00
Yi Kong
343eae73b7 Merge "Pass -Brepro ldflag to Windows builds" into rvc-dev 2020-04-10 06:01:03 +00:00
Yi Kong
dd7531160b 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
Merged-In: I38fe993eec23c60bfcf1b76188774bfe06839fa4
(cherry picked from commit a3c22e7ee2)
Exempt-From-Owner-Approval: backport
2020-04-10 06:00:49 +00:00
Yabin Cui
bb5ee50e29 Merge "Disable cert-dcl51-cpp and -cert-dcl37-c." 2020-04-10 05:39:59 +00:00
Treehugger Robot
a325487e9f Merge "Export API files as part of the java_sdk_library" am: 318f68226b am: 7dc6778d73
Change-Id: I1196b3e1acf851db7e69b2ad86d50a9f2cb14ed9
2020-04-10 04:53:37 +00:00
Treehugger Robot
84adeb3b9d Merge "Export stub sources as part of the java_sdk_library" am: b661961825 am: c61ca98d63
Change-Id: Ic8efc6c417e65bbc28639cafb068ac5674734cf1
2020-04-10 04:53:26 +00:00
Treehugger Robot
7dc6778d73 Merge "Export API files as part of the java_sdk_library" am: 318f68226b
Change-Id: Ic3627e1f3b3e6c84192dbc463da10ea517d5da16
2020-04-10 04:29:10 +00:00