Commit Graph

22618 Commits

Author SHA1 Message Date
Jaewoong Jung
fad5874fe8 Merge "Make android_app_import multi targets arch module." am: 3f2845d251 am: 13ead1de9f
Change-Id: I51ed55b71442712cdb25558a4c4de610e333868f
2020-05-27 16:42:36 +00:00
Jaewoong Jung
13ead1de9f Merge "Make android_app_import multi targets arch module." am: 3f2845d251
Change-Id: I978592ccca49ec6bdc1d99e22333eb06164e549d
2020-05-27 16:28:33 +00:00
Jaewoong Jung
3f2845d251 Merge "Make android_app_import multi targets arch module." 2020-05-27 16:14:58 +00:00
David Srbecky
a0e735087a [automerger skipped] Merge "Allow the user to explicitly set the java Uncompress_dex property." am: 38b2a86091 am: 541d1002f5 -s ours
am skip reason: Change-Id I4490aa0a61fa71f830feb6a46dffd8d20fccfc66 with SHA-1 98c71228f1 is in history

Change-Id: Ie745342896635768f56e2806b64d4e3197328d6e
2020-05-27 14:22:19 +00:00
David Srbecky
541d1002f5 Merge "Allow the user to explicitly set the java Uncompress_dex property." am: 38b2a86091
Change-Id: I6a687915d745dbeacfbf85d44b161ed6c348d34b
2020-05-27 14:10:11 +00:00
David Srbecky
38b2a86091 Merge "Allow the user to explicitly set the java Uncompress_dex property." 2020-05-27 13:45:29 +00:00
Anton Hansson
ec68fb417e Merge "Improve the structure of the link check method" into rvc-dev am: 5e8c81a91d
Change-Id: I097494045b4ce961b5d0f019e856893e19988e32
2020-05-27 11:20:20 +00:00
Anton Hansson
5e8c81a91d Merge "Improve the structure of the link check method" into rvc-dev 2020-05-27 11:09:53 +00:00
Anton Hansson
f202afab16 Merge "Remove conditional running of checklast during checkapi" am: 54d925e88d am: e64809ff83
Change-Id: I57434cf562fa6c82ec0f329f280fd629e3be4497
2020-05-27 10:58:06 +00:00
Anton Hansson
e64809ff83 Merge "Remove conditional running of checklast during checkapi" am: 54d925e88d
Change-Id: I4fb609add51356d0efd3e36a0cf47912f56fdf77
2020-05-27 10:46:24 +00:00
Anton Hansson
54d925e88d Merge "Remove conditional running of checklast during checkapi" 2020-05-27 10:28:41 +00:00
Paul Duffin
507bcadf76 [automerger skipped] Switch droiddoc to use SdkHeaderJars() am: 174b26e7d3 -s ours
am skip reason: Change-Id I2b718cc1445c04e849dcb0b1f53bba2b0bd90c95 with SHA-1 649dadfb87 is in history

Change-Id: I73da5e0a9b25509d514cfd334313be347319f972
2020-05-27 09:24:59 +00:00
Paul Duffin
9b849300ff java_sdk_library: Expose implementation within APEX am: bf19a97965
Change-Id: Idef79f8551774969a693ae6f097fee45089ecd06
2020-05-27 09:24:48 +00:00
Paul Duffin
ca795bef24 [automerger skipped] java_sdk_library: Only expose impl jars when they are built am: 2e7ed65fc4 -s ours
am skip reason: skipped by user paulduffin

Change-Id: I9b563d3ab5f9eb0733e0f024f538419b0aba512d
2020-05-27 09:24:46 +00:00
Lukács T. Berki
eff43bf1cf Merge "Call Delve using exec() instead of "dlv attach"." am: ad37304762 am: bb751686ae
Change-Id: I57bfe2cc7afa88b83d54162c18fdae24fa825857
2020-05-27 09:05:02 +00:00
Lukács T. Berki
bb751686ae Merge "Call Delve using exec() instead of "dlv attach"." am: ad37304762
Change-Id: I453fa205399d208591e30e6e665c2d4be1220349
2020-05-27 08:49:43 +00:00
Lukács T. Berki
ad37304762 Merge "Call Delve using exec() instead of "dlv attach"." 2020-05-27 08:33:32 +00:00
Treehugger Robot
eb8c84ed4e Merge "AIDEGen: Add path attribute to okhttp module." am: c7c7e466ac am: d3205312ed
Change-Id: I229231b44e448f72d896545ef525a6c2f39a5e1f
2020-05-27 07:42:54 +00:00
Treehugger Robot
d3205312ed Merge "AIDEGen: Add path attribute to okhttp module." am: c7c7e466ac
Change-Id: I1792658947da52e6181b39cc952f1ff11be1163b
2020-05-27 07:30:01 +00:00
Treehugger Robot
c7c7e466ac Merge "AIDEGen: Add path attribute to okhttp module." 2020-05-27 07:18:19 +00:00
Paul Duffin
11ef6b20f7 [automerger skipped] Merge "java_sdk_library: Simplify SdkLibrary.sdkJars" into rvc-dev am: 96d9fb7d33 -s ours
am skip reason: Change-Id Ib7c544b48dfb53bad3e15f9f73f71bd05cff9b49 with SHA-1 c91f5d0cc7 is in history

Change-Id: If55f001bbb8c07016dbeb130a35387a6aac226a6
2020-05-27 07:02:40 +00:00
Paul Duffin
174b26e7d3 Switch droiddoc to use SdkHeaderJars()
Previously, droiddoc was using SdkImplementationJars() to get a JAR to
add to the classpath in order to resolve unknown references in the
source.

Given that SdkHeaderJars() returns jars created by Turbine which are
(for compilation at least) functionally identical to the implementation
jars there is no point in using the implementation jars.

Bug: 148080325
Test: m nothing
Merged-In: I2b718cc1445c04e849dcb0b1f53bba2b0bd90c95
Change-Id: I2b718cc1445c04e849dcb0b1f53bba2b0bd90c95
(cherry picked from commit 649dadfb87)
2020-05-27 07:41:18 +01:00
Paul Duffin
bf19a97965 java_sdk_library: Expose implementation within APEX
Access to the implementation JARs is restricted to avoid code from
depending on implementation details that could change from one release
to the next which could cause compatibility issues. That is not a
problem when referenced from within the APEX that contains the
java_sdk_library.

As references from within the same APEX often need to access
implementation specific details of the java_sdk_library and doing that
from within the same APEX is safe this change all references to a
java_sdk_library made within the same APEX to use the implementation
jars instead of stub jars.

Bug: 155164730
Test: m droid
Change-Id: If239059690de61683c2ad2d8a0ce2e47286a3637
(cherry picked from commit 9b879594ed)
2020-05-27 07:41:18 +01:00
Paul Duffin
2e7ed65fc4 java_sdk_library: Only expose impl jars when they are built
The implementation jars are not built if api_only: true. In that case
the jar paths must not be exposed implicitly as they will be nil and
they will just be ignored.

This change ensures that stubs are returned when the implementation
jars are not built.

Bug: 155164730
Test: m droid
Change-Id: Ic495982a5dcb2754916260e7d91d921a5da288ae
(cherry picked from commit daaa332827)
2020-05-27 07:41:18 +01:00
Paul Duffin
96d9fb7d33 Merge "java_sdk_library: Simplify SdkLibrary.sdkJars" into rvc-dev 2020-05-27 06:37:56 +00:00
TreeHugger Robot
e5138b82ab Merge "Allow the user to explicitly set the java Uncompress_dex property." into rvc-dev am: 6270b775de
Change-Id: If73110d3028a1accf0cf61e6baa3b265f443f763
2020-05-27 04:58:51 +00:00
TreeHugger Robot
6270b775de Merge "Allow the user to explicitly set the java Uncompress_dex property." into rvc-dev 2020-05-27 04:30:37 +00:00
Kousik Kumar
02332a2e8b Merge "Add support for remote-execution / caching of turbine actions" am: 97d095516e am: a858736c86
Change-Id: I3fd5bd5a82f6a69a57f0105ed4eb21ab45651a57
2020-05-27 04:17:07 +00:00
Kousik Kumar
a858736c86 Merge "Add support for remote-execution / caching of turbine actions" am: 97d095516e
Change-Id: Ic5b941bc743ca9471393f1f8467daa9591d674d5
2020-05-27 04:01:27 +00:00
Kousik Kumar
97d095516e Merge "Add support for remote-execution / caching of turbine actions" 2020-05-27 03:41:50 +00:00
Jaewoong Jung
6abfbf7f9c Make android_app_import multi targets arch module.
I made a mistake and only fixed android_test_import in my previous
change, I5bbb2d2b733bbd6b868898285683ba5ff45be10b.

Bug: 154281342
Test: TreeHugger
Test: chromium-webview
Change-Id: I1575d9ef3f8596f1eb8db0867db09de08945d711
2020-05-26 20:10:08 -07:00
Paul Duffin
d5bd8f82aa Switch droiddoc to use SdkHeaderJars() am: 649dadfb87 am: 033f903c76
Change-Id: Ib386420ed0ea9492272019528d445fbf3b1c39a4
2020-05-26 22:08:39 +00:00
Paul Duffin
8ecb28156b java_sdk_library: Expose implementation within APEX am: 9b879594ed am: af853b758f
Change-Id: I428d88113401ab9e6befef2574a01d8579e91c55
2020-05-26 22:08:35 +00:00
Paul Duffin
2fa5ff0d25 java_sdk_library: Only expose impl jars when they are built am: daaa332827 am: d3320c8787
Change-Id: I708870ffee014e50c7bbeb018672bfb9bac03a91
2020-05-26 22:08:22 +00:00
Paul Duffin
033f903c76 Switch droiddoc to use SdkHeaderJars() am: 649dadfb87
Change-Id: I759808445fe9fa92fa52181fb0098e6c6136a7c4
2020-05-26 21:49:27 +00:00
Paul Duffin
af853b758f java_sdk_library: Expose implementation within APEX am: 9b879594ed
Change-Id: Id2517fa4b099a75663b2f8599f280223aafa25f8
2020-05-26 21:49:24 +00:00
Paul Duffin
d3320c8787 java_sdk_library: Only expose impl jars when they are built am: daaa332827
Change-Id: I18f5be5e66fca6c1185b5c3f92d790a2fee8b3c2
2020-05-26 21:49:02 +00:00
Paul Duffin
00b206ee23 java_sdk_library: Simplify SdkLibrary.sdkJars
The expression !sdkVersion.specified() is equivalent to the following:
    !sdkVersion.valid() || sdkVersion.kind == sdkPrivate

That means that the else if clause "sdkVersion.kind == sdkPrivate" will
never be reached so it was removed.

There is also no need to check sdkVersion.valid() as that will already
have been checked, and an error reported, before this code has been
called. Therefore that has been removed.

Bug: 148080325
Test: m nothing
Merged-In: Ib7c544b48dfb53bad3e15f9f73f71bd05cff9b49
Change-Id: Ib7c544b48dfb53bad3e15f9f73f71bd05cff9b49
(cherry picked from commit c91f5d0cc7)
2020-05-26 20:20:23 +01:00
Paul Duffin
649dadfb87 Switch droiddoc to use SdkHeaderJars()
Previously, droiddoc was using SdkImplementationJars() to get a JAR to
add to the classpath in order to resolve unknown references in the
source.

Given that SdkHeaderJars() returns jars created by Turbine which are
(for compilation at least) functionally identical to the implementation
jars there is no point in using the implementation jars.

Bug: 148080325
Test: m nothing
Change-Id: I2b718cc1445c04e849dcb0b1f53bba2b0bd90c95
2020-05-26 18:32:44 +01:00
Paul Duffin
9b879594ed java_sdk_library: Expose implementation within APEX
Access to the implementation JARs is restricted to avoid code from
depending on implementation details that could change from one release
to the next which could cause compatibility issues. That is not a
problem when referenced from within the APEX that contains the
java_sdk_library.

As references from within the same APEX often need to access
implementation specific details of the java_sdk_library and doing that
from within the same APEX is safe this change all references to a
java_sdk_library made within the same APEX to use the implementation
jars instead of stub jars.

Bug: 155164730
Test: m droid
Change-Id: If239059690de61683c2ad2d8a0ce2e47286a3637
2020-05-26 18:32:44 +01:00
Paul Duffin
daaa332827 java_sdk_library: Only expose impl jars when they are built
The implementation jars are not built if api_only: true. In that case
the jar paths must not be exposed implicitly as they will be nil and
they will just be ignored.

This change ensures that stubs are returned when the implementation
jars are not built.

Bug: 155164730
Test: m droid
Change-Id: Ic495982a5dcb2754916260e7d91d921a5da288ae
2020-05-26 18:32:44 +01:00
Nikita Ioffe
c649a55d1c [automerger skipped] Merge "Always set targetSdkLevel to DefaultAppTargetSdk" am: 62bd3c7b47 am: df5ef957cc -s ours
am skip reason: Change-Id Ibe63352c2fc474dd816d87ac79b31a56d32b35d2 with SHA-1 5f6771e160 is in history

Change-Id: I61c2c14bd97c91ca18f8710d6980c7c7bd8e1677
2020-05-26 17:15:52 +00:00
Anton Hansson
668b8a21cf Remove conditional running of checklast during checkapi
Since the metalava invocations have been merged into a single one,
and checkapi already requires the other timestamp, this has no effect.

Bug: 151160048
Test: m checkapi
Change-Id: I560058f0f4cdeaedaf247cd35119da2cf0b86ea0
2020-05-26 18:09:33 +01:00
Nikita Ioffe
df5ef957cc Merge "Always set targetSdkLevel to DefaultAppTargetSdk" am: 62bd3c7b47
Change-Id: I2aae04937917406f12c7446aa5e4349a4aa5d143
2020-05-26 16:58:20 +00:00
Nikita Ioffe
62bd3c7b47 Merge "Always set targetSdkLevel to DefaultAppTargetSdk" 2020-05-26 16:47:42 +00:00
Treehugger Robot
ec50b139e8 Merge "java_sdk_library: Simplify SdkLibrary.sdkJars" am: 3f82e2426e am: 327b94a92a
Change-Id: Icc22089165dbb0e0b6111e3fc6df62144177bd72
2020-05-26 16:16:59 +00:00
Treehugger Robot
327b94a92a Merge "java_sdk_library: Simplify SdkLibrary.sdkJars" am: 3f82e2426e
Change-Id: Ide69775757b1cf0c3346a1e43b9f29e89c1ad098
2020-05-26 16:00:52 +00:00
Treehugger Robot
3f82e2426e Merge "java_sdk_library: Simplify SdkLibrary.sdkJars" 2020-05-26 15:46:52 +00:00
satayev
84ff6be8e9 Merge "Generate combined deps-info for all updatable modules." am: ede18549e5 am: 3a0a6427bd
Change-Id: I2ae338e9f883695260d922e6607c73770a4c8c04
2020-05-26 14:03:00 +00:00
satayev
3a0a6427bd Merge "Generate combined deps-info for all updatable modules." am: ede18549e5
Change-Id: If886f3b3228b8e26138dff0329c03aad9c71d33d
2020-05-26 13:47:02 +00:00