Luis Hector Chavez
0fae5d0806
Merge "Make mksquashfs generate a fs_config-friendly root entry" am: 3d4fb4e335 am: 6128d7f30d
...
am: 21025515e4
2018-02-27 16:41:46 +00:00
Luis Hector Chavez
21025515e4
Merge "Make mksquashfs generate a fs_config-friendly root entry" am: 3d4fb4e335
...
am: 6128d7f30d
2018-02-27 16:36:39 +00:00
Treehugger Robot
3d4fb4e335
Merge "Make mksquashfs generate a fs_config-friendly root entry"
2018-02-27 16:24:21 +00:00
Dan Willemsen
fb394978aa
Remove some uses of export/unexport
...
All of these are already handled by soong_ui.
Test: inspect build/soong/ui/build/config.go
Change-Id: I3aa4dcd40ea92759374f9894d525507ef970a584
2018-02-27 02:14:11 -08:00
Dan Willemsen
8d5dc6be57
Better error for missing LOCAL_SRC_FILES in prebuilts
...
If there's a prebuilt with LOCAL_MULTILIB := true, but only a single
LOCAL_SRC_FILES entry, we end up with a weird build error where `cp`
is trying to copy the local directory. Exit early with an error in this
case.
Bug: 73904572
Test: build-aosp_marlin.ninja is identical
Change-Id: Ie2821817c237087a96e87fb9602e430e0f86584a
2018-02-26 21:01:45 -08:00
Dan Willemsen
f65052640e
Merge "Use xmllint built from source" am: 063e6b2939 am: 41d79327cd
...
am: 993655b8bf
2018-02-27 04:43:13 +00:00
Dan Willemsen
993655b8bf
Merge "Use xmllint built from source" am: 063e6b2939
...
am: 41d79327cd
2018-02-27 04:38:10 +00:00
Dan Willemsen
4c36d45a2c
Use xmllint built from source
...
Instead of relying on whatever version of xmllint is on the host system,
build and use the version in external/libxml2.
Test: diff build_aosp-marlin.ninja, expected changes.
Test: m $(xmllint targets in build_aosp-marlin.ninja)
Test: introduce xml error, build fails
Change-Id: I39579f06db3777e3b5c8dda7c7541c25a35887b2
2018-02-27 02:34:08 +00:00
Przemyslaw Szczepaniak
a5b2bad232
Merge "Remove org.apache.http.legacy from bootclasspath"
2018-02-23 14:05:59 +00:00
Nan Zhang
08dc62dd09
Merge "Export Make config vars to Soong to support Droiddoc" am: 5d7ec6bdf8 am: 7edfe29e8f
...
am: b335c4a4f3
2018-02-22 23:25:08 +00:00
Nan Zhang
b335c4a4f3
Merge "Export Make config vars to Soong to support Droiddoc" am: 5d7ec6bdf8
...
am: 7edfe29e8f
2018-02-22 23:11:08 +00:00
Treehugger Robot
5d7ec6bdf8
Merge "Export Make config vars to Soong to support Droiddoc"
2018-02-22 22:11:07 +00:00
Przemyslaw Szczepaniak
bd613de7ff
Remove org.apache.http.legacy from bootclasspath
...
Another attempt, waiting for b/73762903 to be mitigated
Change-Id: I496b1297f5dfe0737828ab01fc1b628f64a57304
Test: build, flash and cts/tests/signature/runSignatureTests.sh, manual
Bug: 18027885
2018-02-22 16:38:49 +00:00
Przemyslaw Szczepaniak
99abb9f731
Merge "Revert "Remove org.apache.http.legacy from bootclasspath""
2018-02-22 16:10:12 +00:00
Przemyslaw Szczepaniak
929db472be
Revert "Remove org.apache.http.legacy from bootclasspath"
...
This reverts commit 58b793771c
2018-02-22 16:07:53 +00:00
hansson
1b7700340c
Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." am: 3c76d02668 am: ab8f5d74f2
...
am: 1f903cce0c
2018-02-22 12:03:30 +00:00
hansson
1f903cce0c
Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." am: 3c76d02668
...
am: ab8f5d74f2
2018-02-22 11:53:50 +00:00
hansson
3c76d02668
Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS."
2018-02-22 11:33:57 +00:00
TreeHugger Robot
3d4d61d080
Merge "Remove org.apache.http.legacy from bootclasspath"
2018-02-22 04:34:34 +00:00
Nan Zhang
972bd248f9
Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd am: 90b8d087e6
...
am: 7e634580ba
2018-02-22 02:36:22 +00:00
Nan Zhang
7e634580ba
Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd
...
am: 90b8d087e6
2018-02-22 02:29:18 +00:00
Treehugger Robot
d3bec931cd
Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make."
2018-02-22 02:07:15 +00:00
Mathieu Chartier
bccd0a571b
Merge "Add property for generating dm files" am: 3d2b45ad55 am: d8cb5746be
...
am: a6355cbc9b
2018-02-22 01:50:08 +00:00
Mathieu Chartier
a6355cbc9b
Merge "Add property for generating dm files" am: 3d2b45ad55
...
am: d8cb5746be
2018-02-22 01:42:33 +00:00
Nan Zhang
0abdb5811d
Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.
...
<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.
Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
2018-02-21 14:12:18 -08:00
Mathieu Chartier
5c658ac3a9
Add property for generating dm files
...
Added product property: PRODUCT_DEX_PREOPT_GENERATE_DM_FILES.
If this property is true, APKs compiled as verify will have the dex
files left compressed and the vdex put in a dm file. The vdex file
and oat files are not copied to system partition in this case.
Bug: 70934104
Test: manual
Change-Id: Ie137e14f14642b803a506162de6db8ac65a43f46
2018-02-21 13:50:21 -08:00
Anton Hansson
7ff32d2734
Add support for LOCAL_PRIVATE_PLATFORM_APIS.
...
The only enforcement right now is that modules don't specify both
LOCAL_SDK_VERSION and LOCAL_PRIVATE_PLATFORM_APIS, but a warning
can be turned on by setting the JAVA_SDK_ENFORCEMENT_WARNING variable.
Bug: 73535841
Test: make w/ and wo/ flag.
Change-Id: I3cc720bf060e2bc789e10884ff888d527b91cb50
2018-02-21 18:10:59 +00:00
Przemyslaw Szczepaniak
58b793771c
Remove org.apache.http.legacy from bootclasspath
...
Test: build, flash and cts/tests/signature/runSignatureTests.sh, manual
Bug: 18027885
Change-Id: I6a6d35198c49ed8a0b370fbe4a94320aefc4d7c3
2018-02-21 18:04:28 +00:00
TreeHugger Robot
0710ca2056
Merge "Add rule to enable running Jetifier within Make against Java modules"
2018-02-20 23:35:10 +00:00
Jeff Gaston
d2ba724f7f
Add rule to enable running Jetifier within Make against Java modules
...
The only case where we expect to actually enable this behavior is for
modules that are just an unpacking of a prebuilt, because those are
the only cases for which we can't conveniently just change the source
Bug: 72552006
Test: ./build/soong/scripts/diff_build_graphs.sh \
--products=aosp_arm 'build/make:work^' \
'build/make:work'
Test: cherry-pick the following patch that depends on this one and
the rest of that patch's topic, and then do `m -j jeffapp`
Change-Id: I62e231900d6d87673ddf19c7fc2686fef2828590
2018-02-20 22:25:23 +00:00
Colin Cross
9489d36c23
Merge "Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""" am: fcb10864b7 am: 55219c3bf8
...
am: 64351dfa66
2018-02-20 20:20:59 +00:00
Colin Cross
64351dfa66
Merge "Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""" am: fcb10864b7
...
am: 55219c3bf8
2018-02-20 20:13:15 +00:00
Treehugger Robot
fcb10864b7
Merge "Revert "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"""
2018-02-20 19:50:50 +00:00
Chris Morin
cff1aa0d87
Merge "have patchoat take directories instead of filenames" am: 6cb3e300fc am: 8955ffb648
...
am: e5a0e49daa
2018-02-20 18:59:56 +00:00
Chris Morin
e5a0e49daa
Merge "have patchoat take directories instead of filenames" am: 6cb3e300fc
...
am: 8955ffb648
2018-02-20 18:54:10 +00:00
Treehugger Robot
6cb3e300fc
Merge "have patchoat take directories instead of filenames"
2018-02-20 18:30:42 +00:00
Elliott Hughes
05ae8ed76b
Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too." am: 1d7d1eb65e am: be692347f5
...
am: 8375aa9168
2018-02-20 15:52:15 +00:00
Elliott Hughes
8375aa9168
Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too." am: 1d7d1eb65e
...
am: be692347f5
2018-02-20 15:44:11 +00:00
Elliott Hughes
1d7d1eb65e
Merge "Use the platform -std= for LOCAL_SDK_VERSION targets too."
2018-02-20 15:27:54 +00:00
Dan Willemsen
b5ab2c7828
Merge "Revert^2 "Replace $(shell find | sort) with $(sort $(shell find))""
2018-02-19 22:51:11 +00:00
Dan Willemsen
a350b67ec4
Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""" am: 5fdae96b06 am: 1964dbc6ad
...
am: 6bd3e1f31c
2018-02-17 04:19:27 +00:00
Dan Willemsen
6bd3e1f31c
Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""" am: 5fdae96b06
...
am: 1964dbc6ad
2018-02-17 04:10:02 +00:00
Treehugger Robot
5fdae96b06
Merge "Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"""
2018-02-17 03:15:58 +00:00
Dan Shi
e2a2481619
Merge "build: Default test modules to null-suite" am: b6655e0e1a am: f2f7c7d6f6
...
am: 4125716024
2018-02-17 01:12:30 +00:00
Elliott Hughes
adf7ef8eb9
Use the platform -std= for LOCAL_SDK_VERSION targets too.
...
Bug: http://b/72571399
Test: builds
Change-Id: Ifd06798a7c9af9fd316201d88b724a53bcf0bcd9
2018-02-16 17:12:21 -08:00
Dan Shi
4125716024
Merge "build: Default test modules to null-suite" am: b6655e0e1a
...
am: f2f7c7d6f6
2018-02-17 01:03:45 +00:00
Dan Shi
b6655e0e1a
Merge "build: Default test modules to null-suite"
2018-02-17 00:39:27 +00:00
Dan Willemsen
ed767bc62a
Merge "Support core_current when exporting resources from a package" am: 64006ad4f3 am: 44cca0767e
...
am: c15e211a1c
2018-02-17 00:14:35 +00:00
Mathieu Chartier
91055f89db
Merge "Add a product property for changing the default compiler filter" am: 60431c098e am: d66be15c96
...
am: 18f0f94b01
2018-02-17 00:13:55 +00:00
Dan Willemsen
c15e211a1c
Merge "Support core_current when exporting resources from a package" am: 64006ad4f3
...
am: 44cca0767e
2018-02-17 00:05:22 +00:00
