Alex Klyubin
9d439f54b1
Merge "Faster auto-detection of APK's minSdkVersion" am: 620686f3c6
...
am: 1f5e43cb6f
2016-12-14 23:54:36 +00:00
Alex Klyubin
9b75e272b6
Faster auto-detection of APK's minSdkVersion
...
Prior to this change, when signing APKs, the build system invoked
'aapt dump badging' on each APK, to detect the value to pass into
signapk as --min-sdk-version. Now that signapk uses the apksig
library, it can auto-detect that value on its own, thus avoiding the
need to invoke 'aapt dump badging' and thus speeding up the build
process.
The semantics of signapk's --min-sdk-version flag is changed by this
commit from having the default value of 0 to having the default value
of "auto-detect from APK".
P.S. The get-package-min-sdk-version-int is not removed from
core/definitions.mk in this commnit, because this function is used in
another project's .mk file and thus that .mk file needs to be modified
first.
Test: rm -Rf out/ && make
Change-Id: I0972fcf0abbde9cbf6794e6c05c743c77c8a78f9
2016-12-14 12:53:44 -08:00
Dan Willemsen
17f8795332
Merge "Implement LOCAL_TEST_DATA to ship data with tests" am: dd0e69d47f am: 04cf52edab am: 1f7aae0ac2
...
am: e31b1a81c9
2016-12-14 04:23:27 +00:00
Dan Willemsen
e31b1a81c9
Merge "Implement LOCAL_TEST_DATA to ship data with tests" am: dd0e69d47f am: 04cf52edab
...
am: 1f7aae0ac2
2016-12-14 04:16:27 +00:00
Dan Willemsen
1f7aae0ac2
Merge "Implement LOCAL_TEST_DATA to ship data with tests" am: dd0e69d47f
...
am: 04cf52edab
2016-12-14 04:08:57 +00:00
Dan Willemsen
0be6907b2b
Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert
...
Soong only supports exporting include directories under the current
directory. So bring non-local directories up as a potential problem in
soong_to_convert.txt
Test: m -j $OUT/soong_to_convert.txt, inspect
Change-Id: I7a15b92e10a1d8b8d3496c6f0529a0d0824f301e
2016-12-13 18:29:59 -08:00
Dan Willemsen
d07ba4e2a6
Implement LOCAL_TEST_DATA to ship data with tests
...
This can be used to ship source data as test artifacts next to native
tests. It works for both local builds and the test bundles using
package_modules.mk.
You just specify a file list relative to the local directory, and those
files will be copied next to the executable under
/data/nativetest*/<module>/...:
LOCAL_MODULE := mytest
LOCAL_TEST_DATA := data/file1 file2
/data/nativetest/mytest/mytest
/data/nativetest/mytest/data/file1
/data/nativetest/mytest/file2
If the data is in another directory, you may also specify a different
prefix for the source files:
LOCAL_TEST_DATA := external/skia:resources/f.xml
/data/nativetest/skia_test/resources/f.xml
And there's a new convenience macro to find a list of files in this
format:
LOCAL_TEST_DATA := $(call find-test-data-in-subdirs,external/skia,"*.xml",resources)
I'll expand this to native benchmarks and fuzz tests in a later change,
since they don't have their own module classes yet.
Bug: 30564705
Test: m -j minikin_tests; ls $OUT/data/nativetest*/minikin_tests
Test: m -j continuous_native_tests dist; zipinfo -1 out/dist/*continuous_native_tests*.zip
Change-Id: Ic76a7b62e7f567f259c4ab1510ee97d26600ba9a
2016-12-13 17:18:36 -08:00
Adam Seaton
29d4c009c1
Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e am: 6f5107fc6b
...
am: 8311e0eb1e
2016-12-14 00:46:49 +00:00
Adam Seaton
9cab808930
Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e am: 89e9059995
...
am: 7b86c49b95
2016-12-14 00:46:49 +00:00
Adam Seaton
8d1614a041
Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5 am: 88add823ae
...
am: 9c909b1b57
2016-12-14 00:46:44 +00:00
Adam Seaton
3692e73cd5
Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5 am: 548f3ec0d3
...
am: 2af57857b8
2016-12-14 00:46:44 +00:00
Adam Seaton
7b86c49b95
Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e
...
am: 89e9059995
2016-12-14 00:40:49 +00:00
Adam Seaton
94fbbd200e
Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e
...
am: 89e9059995
2016-12-14 00:40:49 +00:00
Adam Seaton
2af57857b8
Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5
...
am: 548f3ec0d3
2016-12-14 00:40:43 +00:00
Adam Seaton
0dd5eff86c
Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5
...
am: 548f3ec0d3
2016-12-14 00:40:43 +00:00
Adam Seaton
6f5107fc6b
Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231
...
am: dec80c416e
2016-12-14 00:34:18 +00:00
Adam Seaton
89e9059995
Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231
...
am: dec80c416e
2016-12-14 00:34:18 +00:00
Adam Seaton
88add823ae
Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09
...
am: 2cc397f4c5
2016-12-14 00:34:13 +00:00
Adam Seaton
548f3ec0d3
Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09
...
am: 2cc397f4c5
2016-12-14 00:34:13 +00:00
Adam Seaton
dec80c416e
Update Security String to 2017-02-05 on nyc-dev am: af63566009
...
am: f6dbc77231
2016-12-14 00:27:48 +00:00
Adam Seaton
2cc397f4c5
Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0
...
am: eaf4508b09
2016-12-14 00:27:43 +00:00
Adam Seaton
f6dbc77231
Update Security String to 2017-02-05 on nyc-dev
...
am: af63566009
2016-12-14 00:21:16 +00:00
Adam Seaton
eaf4508b09
Update Security String to 2017-02-01 on nyc-dev
...
am: 35901a7fd0
2016-12-14 00:21:12 +00:00
Dan Willemsen
e26036ad5e
Merge "Sort and reorganize clear_vars.mk to make merges easier"
2016-12-13 22:22:59 +00:00
Dan Willemsen
548d113d74
Sort and reorganize clear_vars.mk to make merges easier
...
am: 05ebf54158
2016-12-13 21:20:31 +00:00
Dan Willemsen
d78d6c9fc0
Sort and reorganize clear_vars.mk to make merges easier
...
Moved common variables from other sections back to the common section,
then sort each section.
Test: build-aosp_angler.ninja is identical before/after
Change-Id: Ibb75935205aa80aaa392c358f8d0599ba624f90d
Merged-In: Ibb75935205aa80aaa392c358f8d0599ba624f90d
2016-12-13 21:14:25 +00:00
Dan Willemsen
bb84f65d5b
Merge "Sort and reorganize clear_vars.mk to make merges easier" into nyc-mr1-dev-plus-aosp
2016-12-13 21:13:12 +00:00
Paul Duffin
1d0355691e
Merge "Use legacy-test instead of core-junit" am: e28eb9ff0e am: 34e4a7b7fd am: 2c373fbeb4
...
am: 4ba342a74f
2016-12-13 10:04:27 +00:00
Paul Duffin
4ba342a74f
Merge "Use legacy-test instead of core-junit" am: e28eb9ff0e am: 34e4a7b7fd
...
am: 2c373fbeb4
2016-12-13 09:57:54 +00:00
Paul Duffin
2c373fbeb4
Merge "Use legacy-test instead of core-junit" am: e28eb9ff0e
...
am: 34e4a7b7fd
2016-12-13 09:50:53 +00:00
Paul Duffin
e28eb9ff0e
Merge "Use legacy-test instead of core-junit"
2016-12-13 09:34:17 +00:00
Dan Willemsen
05ebf54158
Sort and reorganize clear_vars.mk to make merges easier
...
Moved common variables from other sections back to the common section,
then sort each section.
Test: build-aosp_angler.ninja is identical before/after
Change-Id: Ibb75935205aa80aaa392c358f8d0599ba624f90d
Merged-In: Ibb75935205aa80aaa392c358f8d0599ba624f90d
(cherry picked from commit 3ea1a05917
2016-12-12 19:07:59 -08:00
Dan Willemsen
3ea1a05917
Sort and reorganize clear_vars.mk to make merges easier
...
Moved common variables from other sections back to the common section,
then sort each section.
Test: build-aosp_angler.ninja is identical before/after
Change-Id: Ibb75935205aa80aaa392c358f8d0599ba624f90d
2016-12-12 17:12:51 -08:00
Dan Willemsen
81b3b24a01
Merge "Fix PDK dupbuild issues" am: d1b10b20f6 am: 22c01a60e4 am: 13a820d732
...
am: 574e20256a
2016-12-10 07:39:51 +00:00
Dan Willemsen
574e20256a
Merge "Fix PDK dupbuild issues" am: d1b10b20f6 am: 22c01a60e4
...
am: 13a820d732
2016-12-10 07:33:51 +00:00
Dan Willemsen
13a820d732
Merge "Fix PDK dupbuild issues" am: d1b10b20f6
...
am: 22c01a60e4
2016-12-10 07:27:50 +00:00
Treehugger Robot
d1b10b20f6
Merge "Fix PDK dupbuild issues"
2016-12-10 07:14:12 +00:00
Dan Willemsen
e0bba6fa12
Fix PDK dupbuild issues
...
The PDK uses pattern rules in order to install files from the PDK. When
those files already have build rules, the explicit rules override the
pattern rules, and everything works. But because Make (and Kati) doesn't
attempt to clean the file paths, if one of the rules has a redundant /,
we'll export two ninja rules, and ninja will error out with a dupbuild
error.
The PDK pattern rules are clean, but the explicit notice file creation
was not, it was always adding a double // in between NOTICE_FILES/src
and the module path.
Some modules were also setting a LOCAL_MODULE_PATH with a trailing /,
which is redundant, and also hits the above problem. Instead of fixing
all of the modules, just strip a trailing / from my_module_path.
Bug: 33451638
Test: Build with a PDK
Change-Id: Iff3e98fd191ea90626b9b89f179537e8a75f5ef2
2016-12-09 21:15:41 -08:00
Alan Viverette
1261ca6327
Add exifinterface to Support Library pathmap
...
Bug: 33490490
Test: make docs
Change-Id: If98ee521584c6c79c87792810334e348737d30e4
2016-12-10 01:37:01 +00:00
Colin Cross
863d08052c
Merge "Add more module targets for host, host-cross, host32, host64" am: 77ea32f378 am: 3ae5fc64bf am: 06699bbd7d
...
am: 327fced920
2016-12-09 23:16:51 +00:00
Colin Cross
327fced920
Merge "Add more module targets for host, host-cross, host32, host64" am: 77ea32f378 am: 3ae5fc64bf
...
am: 06699bbd7d
2016-12-09 23:11:21 +00:00
Colin Cross
06699bbd7d
Merge "Add more module targets for host, host-cross, host32, host64" am: 77ea32f378
...
am: 3ae5fc64bf
2016-12-09 23:05:51 +00:00
Colin Cross
d76e2e63ae
Add more module targets for host, host-cross, host32, host64
...
Previously, clang-host would build the clang module for 32-bit and
64-bit for the host and for windows. Make clang-host only compile
for host, and add clang-host-cross for windows. Also add targets
that only build 32-bit or 64-bit: clang-host32, clang-host64,
clang-host-cross32, clang-host-cross64, clang-target32, and
clang-target64.
Test: inspect build.ninja
Change-Id: I7676f9497dfc852f2a0255dda8da06c88eec0db8
2016-12-09 13:08:27 -08:00
Paul Duffin
5bf0587461
Use legacy-test instead of core-junit
...
The core-junit library has been replaced with the legacy-test
library. The latter included everything that was in core-junit
plus some android.test classes that were in frameworks.
Bug: 30188076
Test: make checkbuild
Change-Id: Id2ba827705dbd2c27a1183e1153b03c11a8a4074
2016-12-09 15:21:45 +00:00
Colin Cross
f7b143fdb7
Merge "Pass eng product varible to soong" am: b39165d5df am: c645e17388 am: 43e52e594d
...
am: d5b83c197d
2016-12-09 00:01:46 +00:00
Colin Cross
d5b83c197d
Merge "Pass eng product varible to soong" am: b39165d5df am: c645e17388
...
am: 43e52e594d
2016-12-08 23:56:32 +00:00
Colin Cross
43e52e594d
Merge "Pass eng product varible to soong" am: b39165d5df
...
am: c645e17388
2016-12-08 23:52:01 +00:00
Colin Cross
3753e8a335
Pass eng product varible to soong
...
Test: mmma -j frameworks/compile/libbcc
Change-Id: I79a903528948b728f730385a9de5e431617ff257
2016-12-08 10:05:55 -08:00
Adam Seaton
af63566009
Update Security String to 2017-02-05 on nyc-dev
...
Change-Id: I761c90cd025b2862a3b6fe1cf12e6aebc5fa809f
2016-12-07 23:16:47 +00:00
Adam Seaton
35901a7fd0
Update Security String to 2017-02-01 on nyc-dev
...
Change-Id: I0e2dd0afcb6dd490dd81afb879890eeb41bf121d
2016-12-07 23:04:16 +00:00
Andreas Gampe
380d4a8a49
Merge "Build: Skip JNI lib symlink in second-stage build" am: 6d4123aeb8 am: 2017f8dcd5 am: f15272ed0b
...
am: b5bb2465bc
2016-12-07 17:51:43 +00:00
Andreas Gampe
b5bb2465bc
Merge "Build: Skip JNI lib symlink in second-stage build" am: 6d4123aeb8 am: 2017f8dcd5
...
am: f15272ed0b
2016-12-07 17:48:41 +00:00
Andreas Gampe
f15272ed0b
Merge "Build: Skip JNI lib symlink in second-stage build" am: 6d4123aeb8
...
am: 2017f8dcd5
2016-12-07 17:44:42 +00:00
Treehugger Robot
6d4123aeb8
Merge "Build: Skip JNI lib symlink in second-stage build"
2016-12-07 17:35:53 +00:00
Pat Tjin
faa9ca561f
Merge "build_image: add support for specifying number of inodes" am: c5fd94f2c3 am: ad47e9ff84
...
am: 171df483c3
2016-12-07 07:20:15 +00:00
Pat Tjin
171df483c3
Merge "build_image: add support for specifying number of inodes" am: c5fd94f2c3
...
am: ad47e9ff84
2016-12-07 07:15:44 +00:00
Patrick Tjin
a1900841bb
build_image: add support for specifying number of inodes
...
Add support for specifying number of inodes when creating
system, vendor, oem partitions. These are all read-only
and have no use for extra inodes. Removing extra inodes
saves a lot of space.
Bug: 32246383
Change-Id: I13f1d4614b64a4abc752c42a1c65d3d151481c21
(cherry picked from commit b59eca3586
2016-12-06 21:07:23 -08:00
bowgotsai
6dd1058761
Merge "custom_image: fix build break" am: 52897d4ecb am: ab0ae8e728 am: 882fc2c96a
...
am: 5f58152b73
2016-12-07 03:38:30 +00:00
bowgotsai
5f58152b73
Merge "custom_image: fix build break" am: 52897d4ecb am: ab0ae8e728
...
am: 882fc2c96a
2016-12-07 03:34:30 +00:00
bowgotsai
882fc2c96a
Merge "custom_image: fix build break" am: 52897d4ecb
...
am: ab0ae8e728
2016-12-07 03:30:30 +00:00
Treehugger Robot
52897d4ecb
Merge "custom_image: fix build break"
2016-12-07 03:20:13 +00:00
Andreas Gampe
445553f4e7
Build: Skip JNI lib symlink in second-stage build
...
When creating a sanitized image, skip creating JNI library
symlinks in the second round.
Bug: 33279120
Test: m && m SANITIZE_TARGET=address & ls -l $OUT/system/app/NfcNci/lib/*
Change-Id: Ib5eace9a49eb8b693603ba5cc59e392d575c44e3
2016-12-06 17:56:29 -08:00
TreeHugger Robot
d1fcbe4b5c
Merge "Remove tradefed prebuilt dependancy"
2016-12-06 23:50:41 +00:00
Benoit Lamarche
a836253b72
Merge "Disable Jack's NNode cache" am: 3c731228ba am: fcf364b15a am: 90965a5f69
...
am: 38b64f6567
2016-12-06 16:05:16 +00:00
Benoit Lamarche
38b64f6567
Merge "Disable Jack's NNode cache" am: 3c731228ba am: fcf364b15a
...
am: 90965a5f69
2016-12-06 16:01:46 +00:00
Benoit Lamarche
90965a5f69
Merge "Disable Jack's NNode cache" am: 3c731228ba
...
am: fcf364b15a
2016-12-06 15:58:15 +00:00
Benoit Lamarche
fcf364b15a
Merge "Disable Jack's NNode cache"
...
am: 3c731228ba
2016-12-06 15:54:45 +00:00
Benoit Lamarche
3c731228ba
Merge "Disable Jack's NNode cache"
2016-12-06 15:47:35 +00:00
Benoit Lamarche
9e0d21d96b
Disable Jack's NNode cache
...
Test: N/A
Bug: 33367537
Change-Id: Idf7a518dfcbf5665917465b1ae2f0e09f4532688
2016-12-06 15:00:03 +01:00
Benoit Lamarche
0de297d254
resolve merge conflicts of e04c941 to stage-aosp-master am: 0e61b46673
...
am: dd80dde8d2
2016-12-06 11:16:05 +00:00
Benoit Lamarche
dd80dde8d2
resolve merge conflicts of e04c941 to stage-aosp-master
...
am: 0e61b46673
2016-12-06 11:11:58 +00:00
Benoit Lamarche
0e61b46673
resolve merge conflicts of e04c941 to stage-aosp-master
...
Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
2016-12-06 11:32:41 +01:00
Benoit Lamarche
e04c941668
Merge "Set platform min sdk for Jack to o-b1"
2016-12-06 10:16:26 +00:00
bowgotsai
0f72bca96b
custom_image: fix build break
...
Fix build break caused by
https://android-review.googlesource.com/#/c/305575/ .
Bug: 33358681
Test: make custom_images
Change-Id: I1ba7cf61491c8593b20bdac58e984f1928697b8c
2016-12-06 17:36:31 +08:00
Benoit Lamarche
548ce2ce3a
Merge "Set platform min sdk for Jack to o-b1"
2016-12-06 09:25:46 +00:00
Dan Willemsen
b19a745e6d
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am: 47b0322534 am: 0deb783a52 am: 54eac255b9
...
am: ca9eca2477
2016-12-06 03:44:05 +00:00
Dan Willemsen
ca9eca2477
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am: 47b0322534 am: 0deb783a52
...
am: 54eac255b9
2016-12-06 03:40:35 +00:00
Dan Willemsen
54eac255b9
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am: 47b0322534
...
am: 0deb783a52
2016-12-06 03:36:34 +00:00
Dan Willemsen
0deb783a52
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR"
...
am: 47b0322534
2016-12-06 03:32:05 +00:00
Treehugger Robot
47b0322534
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR"
2016-12-06 03:27:01 +00:00
Dan Willemsen
7cbe3bd688
Merge "Remove aidl, proto, objc from soong_problems" am: bbc072f716 am: 55b1651181 am: 35ab684f8e
...
am: 5b8f1db905
2016-12-06 02:45:26 +00:00
Dan Willemsen
12fa3d37cc
Merge "Soong now exports AIDL_CPP" am: 06a2daac72 am: f1e23b77f4 am: 66509c37dc
...
am: 1aab680f2f
2016-12-06 02:44:30 +00:00
Dan Willemsen
5b8f1db905
Merge "Remove aidl, proto, objc from soong_problems" am: bbc072f716 am: 55b1651181
...
am: 35ab684f8e
2016-12-06 02:37:58 +00:00
Dan Willemsen
35ab684f8e
Merge "Remove aidl, proto, objc from soong_problems" am: bbc072f716
...
am: 55b1651181
2016-12-06 02:34:58 +00:00
Dan Willemsen
1aab680f2f
Merge "Soong now exports AIDL_CPP" am: 06a2daac72 am: f1e23b77f4
...
am: 66509c37dc
2016-12-06 02:32:31 +00:00
Dan Willemsen
55b1651181
Merge "Remove aidl, proto, objc from soong_problems"
...
am: bbc072f716
2016-12-06 02:32:30 +00:00
Treehugger Robot
bbc072f716
Merge "Remove aidl, proto, objc from soong_problems"
2016-12-06 02:28:36 +00:00
Dan Willemsen
66509c37dc
Merge "Soong now exports AIDL_CPP" am: 06a2daac72
...
am: f1e23b77f4
2016-12-06 02:28:30 +00:00
Dan Willemsen
f1e23b77f4
Merge "Soong now exports AIDL_CPP"
...
am: 06a2daac72
2016-12-06 02:25:36 +00:00
Treehugger Robot
06a2daac72
Merge "Soong now exports AIDL_CPP"
2016-12-06 02:20:40 +00:00
Vijay Venkatraman
2b6c204c73
Extends VNDK support in Make by setting LOCAL_USE_VNDK
...
for modules going into vendor partition, except when
they already have LOCAL_SDK_VERSION set.
Test: Any module that uses VNDK
Change-Id: Ic90b165ade8d9845595f371f410635cae6477d7c
2016-12-05 18:19:44 -08:00
Dan Willemsen
c077871f68
Tell Soong about TARGET_COPY_OUT_VENDOR
...
So that it can properly install proprietary components in system/vendor/
or vendor/
Test: lunch aosp_arm-eng; m -j vulkan.default
Test: lunch aosp_flounder-eng; m -j vulkan.default
Change-Id: I98384d2b4f09c3b5de2ed04417880f366828234e
2016-12-05 17:46:30 -08:00
Dan Willemsen
a1c3183455
Remove aidl, proto, objc from soong_problems
...
We support these in Soong now, so stop marking them in soong_to_convert.
Test: Compare soong_to_convert.txt
Change-Id: I89befdfd8c4eaa04ab626d8be090765a1b879d8b
2016-12-05 16:38:14 -08:00
Dan Willemsen
32b283171e
Soong now exports AIDL_CPP
...
So remove it here.
Test: mmma -j system/tools/aidl
Change-Id: Ia92ce6499881c1aec42900fcfdb4e790a67b62b5
2016-12-05 15:16:38 -08:00
Adrien Schildknecht
0ef3d323d5
Manually merge commit 'c13da91' into stage-aosp-master am: ada51f3b8f am: 13f3b5337a
...
am: f147e615ca
2016-12-03 04:19:54 +00:00
Adrien Schildknecht
f147e615ca
Manually merge commit 'c13da91' into stage-aosp-master am: ada51f3b8f
...
am: 13f3b5337a
2016-12-03 04:15:00 +00:00
Adrien Schildknecht
13f3b5337a
Manually merge commit 'c13da91' into stage-aosp-master
...
am: ada51f3b8f
2016-12-03 04:12:53 +00:00
The Android Automerger
ada51f3b8f
Manually merge commit 'c13da91' into stage-aosp-master
...
* commit 'c13da91':
Add support for creating ext4 images with mke2fs
BUG:33304034
2016-12-03 04:02:09 +00:00
Treehugger Robot
c13da91023
Merge "Add support for creating ext4 images with mke2fs"
2016-12-02 22:48:23 +00:00
Colin Cross
d9aae72d14
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b am: 51c1eeefb3 am: 04158fac7c
...
am: c2e68615e7
2016-12-02 22:48:02 +00:00
