Commit Graph

19231 Commits

Author SHA1 Message Date
Songchun Fan
11ac82fc6b Merge "[apex] remove module com.android.incremental" 2020-01-22 17:09:26 +00:00
Automerger Merge Worker
ed9176a259 Merge "Remove unused java_sdk_library_import properties" am: 0c9c0f045f am: 07e5b368c7 am: 1bb242bb7a
Change-Id: Ie82fa67604ef2cd46d28411a4b9c1db47a6bad74
2020-01-22 06:42:15 +00:00
Automerger Merge Worker
1bb242bb7a Merge "Remove unused java_sdk_library_import properties" am: 0c9c0f045f am: 07e5b368c7
Change-Id: I367e707dfcaf953425ca7f93a6734b8fcb86d70b
2020-01-22 06:25:18 +00:00
Paul Duffin
07e5b368c7 Merge "Remove unused java_sdk_library_import properties"
am: 0c9c0f045f

Change-Id: I53bfff7278b691ddffcde088afa7b4b557d6c4db
2020-01-21 22:12:27 -08:00
Treehugger Robot
0c9c0f045f Merge "Remove unused java_sdk_library_import properties" 2020-01-22 06:03:25 +00:00
Automerger Merge Worker
ab527e7a06 Merge "Updates to perf debugging docs" am: 6c54195e0a am: 3f49225890 am: 6ce4fc8bbd
Change-Id: I0c7f6a7691f203861c37932787f777d866ad8af0
2020-01-22 02:24:10 +00:00
Automerger Merge Worker
bf0f54b78b Merge "Reland "use symlink for bundled APEX"" am: 21e40ce36e am: af01efec1c am: bdc7e0f9e2
Change-Id: I470306a8a80efc73318b793cb51eed6f89bdb440
2020-01-22 02:23:27 +00:00
Automerger Merge Worker
6ce4fc8bbd Merge "Updates to perf debugging docs" am: 6c54195e0a am: 3f49225890
Change-Id: I61bb63105dc19fe44623fcad6bade1d8ef2d3579
2020-01-22 02:11:44 +00:00
Automerger Merge Worker
bdc7e0f9e2 Merge "Reland "use symlink for bundled APEX"" am: 21e40ce36e am: af01efec1c
Change-Id: If428ded8ce18985893ac0dede24b94fc5c94c200
2020-01-22 02:11:27 +00:00
Dan Willemsen
3f49225890 Merge "Updates to perf debugging docs"
am: 6c54195e0a

Change-Id: I82cf4c5b45a8702837b6491199fde29890eeb76a
2020-01-21 17:51:50 -08:00
Jiyong Park
af01efec1c Merge "Reland "use symlink for bundled APEX""
am: 21e40ce36e

Change-Id: I0f8a2b984d096489f590ab801fa1831e4b3d8afd
2020-01-21 17:50:04 -08:00
Treehugger Robot
6c54195e0a Merge "Updates to perf debugging docs" 2020-01-22 01:46:05 +00:00
Treehugger Robot
21e40ce36e Merge "Reland "use symlink for bundled APEX"" 2020-01-22 01:41:14 +00:00
Dan Willemsen
6362acd360 Updates to perf debugging docs
Refreshing some examples and references, and adding a new
section on makefile performance debugging.

Test: view in gitiles
Change-Id: I747db67a16105fb738d87a6ead3f5d3e23bff7d0
2020-01-21 23:10:49 +00:00
Automerger Merge Worker
b5e21f9fec Merge "build: Link the unwinder dynamically into platform and vendor binaries." am: d2f8df4b3e am: d248db0569 am: 765ca85910
Change-Id: I974cd680c23df784e1a17ebff2ef18ae8091b2de
2020-01-21 22:42:37 +00:00
Automerger Merge Worker
765ca85910 Merge "build: Link the unwinder dynamically into platform and vendor binaries." am: d2f8df4b3e am: d248db0569
Change-Id: Iff2c736e44cb31e2dca1ec242817727c7477ed61
2020-01-21 22:32:17 +00:00
Peter Collingbourne
d248db0569 Merge "build: Link the unwinder dynamically into platform and vendor binaries."
am: d2f8df4b3e

Change-Id: Ie995fc49afb3d708285c2f8c91d18668b279e420
2020-01-21 14:10:46 -08:00
Peter Collingbourne
d2f8df4b3e Merge "build: Link the unwinder dynamically into platform and vendor binaries." 2020-01-21 21:28:44 +00:00
Automerger Merge Worker
7491494ed9 Merge "Revert "Clean up no-vendor-variant VNDK whitelist"" am: f3cae775e9 am: eefd2dbb9e am: 21eaaee02c
Change-Id: I98b0e040bcd579ef09adcd0d555a095692832817
2020-01-21 21:14:19 +00:00
Automerger Merge Worker
21eaaee02c Merge "Revert "Clean up no-vendor-variant VNDK whitelist"" am: f3cae775e9 am: eefd2dbb9e
Change-Id: Idc1f4526dac1966620957bb71a3ad1988f068a02
2020-01-21 21:04:03 +00:00
Vic Yang
eefd2dbb9e Merge "Revert "Clean up no-vendor-variant VNDK whitelist""
am: f3cae775e9

Change-Id: I42c79c04694fbb3a60197f9f8d8939278f733f10
2020-01-21 12:53:39 -08:00
Vic Yang
f3cae775e9 Merge "Revert "Clean up no-vendor-variant VNDK whitelist"" 2020-01-21 20:45:49 +00:00
Vic Yang
987ebebfbc Revert "Clean up no-vendor-variant VNDK whitelist"
This reverts commit 882e59d45d.

Reason for revert: Breaking build on internal target

Change-Id: I775f120ef140835ee4fe76db5cbbb33255f93b76
2020-01-21 20:38:37 +00:00
Automerger Merge Worker
b8cf5d1a7c Merge "Add FinalDeps mutator phase, where CreateVariations is disallowed." am: 3b23789ffa am: 72810bcd8a am: 718a1772c9
Change-Id: Ifa6fed376f3be94013d7e065abccb6b49d37e83d
2020-01-21 20:11:49 +00:00
Automerger Merge Worker
718a1772c9 Merge "Add FinalDeps mutator phase, where CreateVariations is disallowed." am: 3b23789ffa am: 72810bcd8a
Change-Id: I4292a265cea9f6463dde882992b5f807219ff8af
2020-01-21 19:58:33 +00:00
Martin Stjernholm
72810bcd8a Merge "Add FinalDeps mutator phase, where CreateVariations is disallowed."
am: 3b23789ffa

Change-Id: Iee2374b3235e447812aa4affb26fdbb11cedf40c
2020-01-21 11:48:46 -08:00
Martin Stjernholm
3b23789ffa Merge "Add FinalDeps mutator phase, where CreateVariations is disallowed." 2020-01-21 19:41:54 +00:00
Automerger Merge Worker
2e4fba5798 Merge "Python3 on device links against liblog" am: 5c417b30d0 am: 6b78a7fe91 am: ea971fb763
Change-Id: Ieb7479334f759300ff47ee6c170ea4555e9fd25d
2020-01-21 19:06:28 +00:00
Automerger Merge Worker
c8d49dd28d Merge "Clean up no-vendor-variant VNDK whitelist" am: a07b2f7766 am: c465d38acd am: ca317d9fee
Change-Id: Idd12794b8d29535c90bccbcc5bdb407ffc104cb1
2020-01-21 19:06:15 +00:00
Automerger Merge Worker
93aba9621f Merge "Default to pattern initialization for uninitialized variables." am: b9b979c8aa am: 51fd7fd318 am: 5ae46811a1
Change-Id: I2b994c28f5fa6911f699ad8512193a9e3a55c6e6
2020-01-21 19:06:00 +00:00
Automerger Merge Worker
ea971fb763 Merge "Python3 on device links against liblog" am: 5c417b30d0 am: 6b78a7fe91
Change-Id: Ifa1a1e2e83da84ffe6c91fb9d8549a89ee02f72b
2020-01-21 18:59:22 +00:00
Dan Willemsen
6b78a7fe91 Merge "Python3 on device links against liblog"
am: 5c417b30d0

Change-Id: Iff0e83ff87656fb063de81b16b0bddfc3f65efd4
2020-01-21 10:56:29 -08:00
Automerger Merge Worker
ca317d9fee Merge "Clean up no-vendor-variant VNDK whitelist" am: a07b2f7766 am: c465d38acd
Change-Id: Iad54f45761dc5af930bd9404115233f008eccb53
2020-01-21 18:50:26 +00:00
Automerger Merge Worker
5ae46811a1 Merge "Default to pattern initialization for uninitialized variables." am: b9b979c8aa am: 51fd7fd318
Change-Id: Ie64c9a78714375d534ec0772c84495be32e36d12
2020-01-21 18:50:18 +00:00
Treehugger Robot
5c417b30d0 Merge "Python3 on device links against liblog" 2020-01-21 18:50:04 +00:00
Vic Yang
c465d38acd Merge "Clean up no-vendor-variant VNDK whitelist"
am: a07b2f7766

Change-Id: I67908fbc5b173ba16da002215aac18daaa0b5e5d
2020-01-21 10:44:26 -08:00
Treehugger Robot
a07b2f7766 Merge "Clean up no-vendor-variant VNDK whitelist" 2020-01-21 18:38:55 +00:00
Paul Duffin
29f5576357 Remove unused java_sdk_library_import properties
The properties are just passed through to the java_import module that
it creates to import the stubs so could be used if set. However, none
of the current usages of java_sdk_library_import actually set them and
it is not clear why the following would ever be set on
java_sdk_library_import:
* installable
* exclude_files
* exclude_dirs

The above properties look as though they were simply copied from the
ImportProperties struct.

The libs property is also unused but it seems as though it should be
used to improve compatibility with the source module. e.g.
the source module for android.test.runner has android.test.base and
android.test.mock in its libs. However, the prebuilt version of it
does not.

Bug: 148080325
Test: m nothing
Change-Id: I710e3962b2e34b2b0cc81685d07d4948cef4e6ad
2020-01-21 18:37:58 +00:00
Vic Yang
882e59d45d Clean up no-vendor-variant VNDK whitelist
First round of cleaning. Remove VNDK libraries that
already have identical variants.

Bug: 148082691
Test: Build success
Change-Id: I97f946a2cbf459b607a73e766db9fb8d7655f220
2020-01-21 18:33:44 +00:00
Stephen Hines
51fd7fd318 Merge "Default to pattern initialization for uninitialized variables."
am: b9b979c8aa

Change-Id: I9f17d6ec8f8952d0bec9d87216b2b3d21f599947
2020-01-21 10:12:27 -08:00
Stephen Hines
b9b979c8aa Merge "Default to pattern initialization for uninitialized variables." 2020-01-21 18:06:31 +00:00
Automerger Merge Worker
1660ac1fb6 Merge "Revert "Allow codename.fingerprint format for minSdkVersion"" am: 070d69c74c am: 42a16b7d69 am: 7245755399
Change-Id: Ifcea8861733463b92a46de6ca08b2d6a8ec0a090
2020-01-21 14:51:42 +00:00
Automerger Merge Worker
7245755399 Merge "Revert "Allow codename.fingerprint format for minSdkVersion"" am: 070d69c74c am: 42a16b7d69
Change-Id: Ieea2e2c22a26e5914a29fa762022446b61969e74
2020-01-21 14:30:56 +00:00
Pete Gillin
42a16b7d69 Merge "Revert "Allow codename.fingerprint format for minSdkVersion""
am: 070d69c74c

Change-Id: Iaa25e4c1211e370a5c520c0a96ba4fd5f6dff42f
2020-01-21 06:16:35 -08:00
Pete Gillin
070d69c74c Merge "Revert "Allow codename.fingerprint format for minSdkVersion"" 2020-01-21 14:11:18 +00:00
Pete Gillin
230e241f58 Revert "Allow codename.fingerprint format for minSdkVersion"
This reverts commit 014a85712d.

Reason for revert: Caused vendor/google/build/build_mainline_modules.sh to fail with `Error: minSdkVersion (10000) is greater than maxSdkVersion (30)`.

Bug: 130541924
Change-Id: Ifa233bf40a674481d21b61ee816c5fdde8201080
2020-01-21 13:44:50 +00:00
Martin Stjernholm
710ec3aef2 Add FinalDeps mutator phase, where CreateVariations is disallowed.
This is for use to add dependencies between specific module variants,
without getting the dependencies potentially duplicated as more
variants are created.

Moved genrule tool dependency registration to this phase, to avoid
potential splitting of its dependencies, and for consistency with the
same kind of dependency on dex2oat in https://r.android.com/1205730.

Test: m nothing
Bug: 145934348
Change-Id: I1f9e75354e359cef5f41d14e5016b0a67d7655d7
2020-01-21 11:40:02 +00:00
Dan Willemsen
d7a1dee1c1 Python3 on device links against liblog
Fixes: 148037229
Test: cherry-pick https://r.android.com/1212194; m try_python_binary_test
Change-Id: I6e26ba232d7698a4889a6e0be1aeb09d54cc4dc5
2020-01-20 22:14:45 -08:00
Automerger Merge Worker
23b0a24248 Merge "Use deep copy when copying bpPropertySets" am: 515f043a6b am: b472304a75 am: 981bc5267f
Change-Id: I9f18fdb257f1eda1616eb6d662b44719337f5bfa
2020-01-21 04:34:06 +00:00
Automerger Merge Worker
981bc5267f Merge "Use deep copy when copying bpPropertySets" am: 515f043a6b am: b472304a75
Change-Id: I55c8a44b1c0f9dacfadb9b7666f9e58e3b8243b8
2020-01-21 04:21:21 +00:00