Automerger Merge Worker
710c7d3d0e
Merge "java_sdk_library: Remove requirement for api_packages to be specified" am: 36809d52ba am: 160434a8d7
...
Change-Id: Ief7a4816309df491204892b9ebc56a404eaf8f5e
2020-01-03 13:45:08 +00:00
Automerger Merge Worker
b841cdf23f
Merge "java_sdk_library: support system_modules properly" am: 14544da609 am: c217e75762
...
Change-Id: I771e04a0acc90df380bffa7445413cbdf8b35b8d
2020-01-03 13:44:59 +00:00
Paul Duffin
160434a8d7
Merge "java_sdk_library: Remove requirement for api_packages to be specified"
...
am: 36809d52ba
2020-01-03 05:35:35 -08:00
Paul Duffin
c217e75762
Merge "java_sdk_library: support system_modules properly"
...
am: 14544da609
2020-01-03 05:35:12 -08:00
Paul Duffin
36809d52ba
Merge "java_sdk_library: Remove requirement for api_packages to be specified"
2020-01-03 13:32:54 +00:00
Paul Duffin
14544da609
Merge "java_sdk_library: support system_modules properly"
2020-01-03 13:32:42 +00:00
Automerger Merge Worker
001cb45948
Merge "Whitelist system/apex/shim/build to use test_only_no_hashtree property" am: 414f3a4c86 am: 830981c2ce
...
Change-Id: I17c76ca82c2f6d5232a3a2e505d6fbafbe38b5fc
2020-01-03 11:42:31 +00:00
Nikita Ioffe
830981c2ce
Merge "Whitelist system/apex/shim/build to use test_only_no_hashtree property"
...
am: 414f3a4c86
2020-01-03 03:33:45 -08:00
Nikita Ioffe
414f3a4c86
Merge "Whitelist system/apex/shim/build to use test_only_no_hashtree property"
2020-01-03 11:31:22 +00:00
Automerger Merge Worker
3f8bcc2f82
Merge "java_sdk_library: Avoid generating system and test .txt files" am: 3afbc923dc am: f91ee9fb1a
...
Change-Id: Ic8bebef8d53cf70c288980fc231ece32ea665ee3
2020-01-03 01:16:20 +00:00
Automerger Merge Worker
ad4215744d
Use absolute path for output. am: 17c42bd105 am: 70b9c978d3
...
Change-Id: I25451122c5e768554e65c27778997e630f597206
2020-01-03 01:16:12 +00:00
Paul Duffin
f91ee9fb1a
Merge "java_sdk_library: Avoid generating system and test .txt files"
...
am: 3afbc923dc
2020-01-02 17:04:59 -08:00
Sasha Smundak
70b9c978d3
Use absolute path for output.
...
am: 17c42bd105
2020-01-02 17:00:52 -08:00
Treehugger Robot
3afbc923dc
Merge "java_sdk_library: Avoid generating system and test .txt files"
2020-01-03 00:49:39 +00:00
Nikita Ioffe
b4b44c0be2
Whitelist system/apex/shim/build to use test_only_no_hashtree property
...
It will be used to build a shim apex with zeroed hashtree for use in CTS
tests.
Test: builds
Bug: 145670581
Change-Id: I6f84850fefb3b58a1c2e8328242920d64a61e733
2020-01-02 23:01:39 +00:00
Sasha Smundak
17c42bd105
Use absolute path for output.
...
Test: manual
Bug: 137798757
Change-Id: If2e9c31e1ff523914f5f2cecf8975e1da91c03a7
2020-01-02 11:20:40 -08:00
Automerger Merge Worker
166c249881
java_sdk_library: Rename createDocs to createStubsSources am: c4cea76c0d am: e616c37c88
...
Change-Id: I2965440bcd32aad1f9d0b4d6299df35c4b8b3c68
2020-01-02 16:16:27 +00:00
Automerger Merge Worker
1f0fe5c78f
java_sdk_library: Remove unused stubsLibraryDependencyTag am: 03fbd786b5 am: a17393c17c
...
Change-Id: I83a7055c93818b736ef88aaa1d7d65ad5018d710
2020-01-02 16:16:23 +00:00
Paul Duffin
e616c37c88
java_sdk_library: Rename createDocs to createStubsSources
...
am: c4cea76c0d
2020-01-02 08:01:25 -08:00
Paul Duffin
a17393c17c
java_sdk_library: Remove unused stubsLibraryDependencyTag
...
am: 03fbd786b5
2020-01-02 08:01:22 -08:00
Paul Duffin
7a586d3a59
java_sdk_library: Remove requirement for api_packages to be specified
...
If api_packages is not set then will try and generate stubs from all
the source packages.
Bug: 145998881
Test: m checkbuild
Change-Id: Ic9d7f82bb34c4b960a2f17614d7f64ddd13ad8b0
2020-01-02 15:38:39 +00:00
Paul Duffin
12ceb4699b
java_sdk_library: support system_modules properly
...
Bug: 145998881
Test: m checkbuild
Change-Id: Ia7663dca4b0ce84fe6dafca27e1aeb1bcda86221
2020-01-02 15:38:20 +00:00
Paul Duffin
37e0b77e3b
java_sdk_library: Avoid generating system and test .txt files
...
If the library does not provide system and test APIs then do not
generate/require corresponding .txt files.
Bug: 145998881
Test: m checkbuild
Change-Id: I21cfdb0b63fd575e8c8c63ea2b436e0c4aa8f3fc
2020-01-02 15:38:18 +00:00
Automerger Merge Worker
cd8b9a20f2
Merge "java_sdk_library: construct droidstubs args as []string" am: 0a83b7961c am: bc1aa20ebb
...
Change-Id: I2c068042ef805092b4d0dae82d49219f7301e676
2020-01-02 14:57:07 +00:00
Paul Duffin
c4cea76c0d
java_sdk_library: Rename createDocs to createStubsSources
...
The createDocs(...) method was obviously named because it created a
droiddocs target that generated the stubs source but it now creates a
droidstubs target so the name was misleading.
Bug: 145998881
Test: m checkbuild
Change-Id: I7419b0a01ee87ecb2b396e4817e5e88a88a8b7b6
2020-01-02 14:56:00 +00:00
Paul Duffin
03fbd786b5
java_sdk_library: Remove unused stubsLibraryDependencyTag
...
Bug: 145998881
Test: m checkbuild
Change-Id: I3ce0fa498c261a9a1f0382f6d548bb070a656358
2020-01-02 14:55:27 +00:00
Paul Duffin
bc1aa20ebb
Merge "java_sdk_library: construct droidstubs args as []string"
...
am: 0a83b7961c
2020-01-02 06:39:33 -08:00
Treehugger Robot
0a83b7961c
Merge "java_sdk_library: construct droidstubs args as []string"
2020-01-02 14:34:06 +00:00
Automerger Merge Worker
38c5a8c468
Add support for java_test in sdk am: 1b82e6a108 am: c520a1723c
...
Change-Id: Ib9be165770781094e8c78d73cdaf6eb7512a2453
2020-01-02 11:17:21 +00:00
Paul Duffin
c520a1723c
Add support for java_test in sdk
...
am: 1b82e6a108
2020-01-02 03:02:51 -08:00
Automerger Merge Worker
5f7e9a061b
Restrict SdkMemberTypes that can be used with sdk/sdk_snapshot am: e602918294 am: b39c226ff7
...
Change-Id: I9fbcffebf5b93b73517b2c545b7614f13a88c770
2019-12-31 20:19:49 +00:00
Paul Duffin
b39c226ff7
Restrict SdkMemberTypes that can be used with sdk/sdk_snapshot
...
am: e602918294
2019-12-31 12:03:58 -08:00
Automerger Merge Worker
35cfcb8296
Merge "Added module_exports/_snapshot as alias for sdk/_snapshot" am: 28aa544884 am: a253492d2d
...
Change-Id: Ia6d7fe9051d6c8659224790e64be842c18abc806
2019-12-31 15:15:38 +00:00
Paul Duffin
1b82e6a108
Add support for java_test in sdk
...
Adds java_test_import module type for use by the sdk snapshot and
adds java_tests property to the sdk and sdk_snapshot module type.
This is needed for the conscrypt test sdk.
Bug: 143678475
Test: m nothing
Change-Id: Ied4c56c978dac2f92a9b3bc34b3235d7eeba2fd3
2019-12-31 15:08:59 +00:00
Paul Duffin
e602918294
Restrict SdkMemberTypes that can be used with sdk/sdk_snapshot
...
By default SdkMemberTypes are only supported on module_exports module
type. Support for sdk module type has to be explicitly specified.
The java_header_libs, native_shared_libs and stubs_sources are
supported on sdk. The latter is required to provide the stubs source
for an API specified in java_header_libs as they should be kept in
sync.
Bug: 146341462
Test: m nothing
Change-Id: I19b9e60792780a797458d4a9e489506602b13144
2019-12-31 15:08:59 +00:00
Paul Duffin
235ffffbdc
java_sdk_library: construct droidstubs args as []string
...
Bug: 145998881
Test: m checkbuild
Change-Id: Id3eb99577200a807050dbf86f47816a2476c3d9c
2019-12-31 15:08:33 +00:00
Paul Duffin
a253492d2d
Merge "Added module_exports/_snapshot as alias for sdk/_snapshot"
...
am: 28aa544884
2019-12-31 07:02:20 -08:00
Paul Duffin
28aa544884
Merge "Added module_exports/_snapshot as alias for sdk/_snapshot"
2019-12-31 14:59:19 +00:00
Automerger Merge Worker
956fdb547a
Merge "AIDEGen: collect cc_srcs and cc related flags in module_bp_cc_deps.json" am: 0a6c8813ba am: 3f4ed419b6
...
Change-Id: I9948c229312891639ceda0112a991b109c5fad99
2019-12-31 01:21:01 +00:00
Automerger Merge Worker
d389915493
Merge "Detach VNDK using core library list from VNDK APEX" am: 2c12207919 am: 1290b12a30
...
Change-Id: I5169d33ce32124cb15dc213e3b03456f964aec50
2019-12-31 01:20:34 +00:00
bralee
3f4ed419b6
Merge "AIDEGen: collect cc_srcs and cc related flags in module_bp_cc_deps.json"
...
am: 0a6c8813ba
2019-12-30 17:20:09 -08:00
Treehugger Robot
0a6c8813ba
Merge "AIDEGen: collect cc_srcs and cc related flags in module_bp_cc_deps.json"
2019-12-31 01:16:35 +00:00
Kiyoung Kim
1290b12a30
Merge "Detach VNDK using core library list from VNDK APEX"
...
am: 2c12207919
2019-12-30 17:04:23 -08:00
Kiyoung Kim
2c12207919
Merge "Detach VNDK using core library list from VNDK APEX"
2019-12-31 00:55:46 +00:00
Paul Duffin
8150da6e9d
Added module_exports/_snapshot as alias for sdk/_snapshot
...
Bug: 146341462
Test: m nothing
Change-Id: I27e1ef494a2b0874074aa43614612189b17e7860
2019-12-30 18:03:30 +00:00
Kiyoung Kim
e1aa8ea34e
Detach VNDK using core library list from VNDK APEX
...
Some devices require VNDK using core library list, but this is dependent
to system image rather than VNDK version. This change removes VNDK using
core variant library list file from VNDK APEX, and also remove VNDK
version from its filename.
Bug: 142599349
Test: m -j passed && aosp_cf_x86_go_phone booted
Change-Id: Ibc53b8dfc9d38e14bbaa878154034d25a6d34089
2019-12-30 14:29:52 +09:00
bralee
5a5cce695f
AIDEGen: collect cc_srcs and cc related flags in module_bp_cc_deps.json
...
Define a field CCSrcs and other cc related flags in a type ccIdeInfo
struct and write them into out/soong/module_bp_cc_deps.json. AIDEGen
can use these data to generate CMakeLists.txt by Python for multiple
native projects in CLion IDE.
Bug: 141512319
Test: 1. export SOONG_COLLECT_JAVA_DEPS=false SOONG_COLLECT_CC_DEPS=true;m nothing
check
1). File out/soong/module_bp_cc_deps.json is generated.
2). In "JniInvocation_test" module: "path", "srcs",
"global_common_flags", "local_common_flags",
"global_c_flags", "local_c_flags", "global_c_conly_flags",
"local_c_conly_flags", "global_cpp_flags",
"local_cpp_flags" and "system_include_flags"
have been created.
Change-Id: I9292cc6373157ba68f013998a7364f84a70d5593
2019-12-30 09:35:40 +08:00
Automerger Merge Worker
22bef659fe
Merge "Create APEX variation only when needed" am: e9391f8bab am: b184044c23
...
Change-Id: I3d8ee277dacbca742a924ff5c4707f3296138381
2019-12-28 05:17:02 +00:00
Jiyong Park
b184044c23
Merge "Create APEX variation only when needed"
...
am: e9391f8bab
2019-12-27 21:01:43 -08:00
Treehugger Robot
e9391f8bab
Merge "Create APEX variation only when needed"
2019-12-28 04:18:59 +00:00
