Commit Graph

33072 Commits

Author SHA1 Message Date
Alex Klyubin
176a27a7a2 Merge "Remove unused get-package-min-sdk-version-int" am: 5a1ba84c30
am: 24b383a770

Change-Id: Iafe2ea0495e9c1b5c77eb4d995101c60e85700af
2016-12-16 17:38:40 +00:00
Alex Klyubin
2c70770e93 Merge "aapt no longer needed for signing APKs"
am: 3cfff7386f

Change-Id: I95e90f0c4e31fe79bb72a302bec2d89885959533
2016-12-16 17:30:23 +00:00
Alex Klyubin
24b383a770 Merge "Remove unused get-package-min-sdk-version-int"
am: 5a1ba84c30

Change-Id: Id5b5c1a36f6fe6ef85f9cee12a7e49dacd416801
2016-12-16 17:30:09 +00:00
Alex Klyubin
3cfff7386f Merge "aapt no longer needed for signing APKs" 2016-12-16 17:21:13 +00:00
Alex Klyubin
5a1ba84c30 Merge "Remove unused get-package-min-sdk-version-int" 2016-12-16 17:20:23 +00:00
Vijay Venkatraman
94e6045271 Merge "Revert "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."" am: e4be608d2f
am: fe371b310f

Change-Id: I9b086d31ef7197798d5f0a38864321622b99cccf
2016-12-16 02:26:34 +00:00
Vijay Venkatraman
f880ab9021 Revert "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." am: 823172e209
am: e9709b4575

Change-Id: I8166568b64cbda20c35fb4b07ea24ce6578158fc
2016-12-16 02:26:19 +00:00
Vijay Venkatraman
fe371b310f Merge "Revert "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.""
am: e4be608d2f

Change-Id: I236dd4c28d4bbe65fc51fb3fbd599a3a23129b14
2016-12-16 02:17:48 +00:00
Vijay Venkatraman
e9709b4575 Revert "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."
am: 823172e209

Change-Id: If6249d3b311089ea342fb873288ad38c12bc53d1
2016-12-16 02:17:47 +00:00
Vijay Venkatraman
e4be608d2f Merge "Revert "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."" 2016-12-16 02:11:12 +00:00
Vijay Venkatraman
823172e209 Revert "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."
This reverts commit 2b6c204c73.

Change-Id: I60a042f2ed0c767ec3a45c31ee1b99d43891efaa
2016-12-16 02:08:18 +00:00
Alex Klyubin
664cc31fd8 Remove unused get-package-min-sdk-version-int
The only user of get-package-min-sdk-version-int was signapk. signapk
no longer needs to be provided with the APK's minSdkVersion though.

(cherry picked from commit e185da21ca)
Test: make clean && make

Change-Id: I6867a004aec0f3752cbbc99cc30e02ca5404b3c4
2016-12-15 16:37:37 -08:00
Alex Klyubin
1b391c002d aapt no longer needed for signing APKs
signapk now auto-detects the APK's minSdkVersion, removing the need to
run aapt dump badging during APK signing.

Test: make clean && make
Change-Id: Ifc74292a9900443d053e437b50b540c8d0b33dbd
2016-12-15 16:37:21 -08:00
Vijay Venkatraman
d5c2437942 Merge "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." am: b777f169f8
am: fe9ba5edf4

Change-Id: I9049593af944687aea3b9c664b75a03e025c4a96
2016-12-15 23:02:47 +00:00
Vijay Venkatraman
a41a8d371c 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. am: 2b6c204c73
am: 23da9097fe

Change-Id: I1724efa79766e50eaccc9cd43fa5a143494397ec
2016-12-15 23:02:29 +00:00
Vijay Venkatraman
fe9ba5edf4 Merge "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."
am: b777f169f8

Change-Id: I7d0c58f2c1be9084b8a78a7fa32c9dab6eb31756
2016-12-15 21:37:30 +00:00
Vijay Venkatraman
23da9097fe 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.
am: 2b6c204c73

Change-Id: Iea702c06134f40b312c795ce13d41fa94bc62e15
2016-12-15 21:37:29 +00:00
Vijay Venkatraman
b777f169f8 Merge "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." 2016-12-15 21:26:16 +00:00
dcashman
81fcb95744 Merge "Split mac_permissions.xml into plat and non-plat components." am: b8888197c6
am: 63a91e9ee0

Change-Id: I3f1600730dc239093fa525c854a903d583510c12
2016-12-15 20:40:16 +00:00
dcashman
eb7c416fc2 Split mac_permissions.xml into plat and non-plat components. am: 15171f641e
am: f976eae6f3

Change-Id: I09424929985bfeff10c14853e89af2ae8ac9f9e8
2016-12-15 20:40:10 +00:00
dcashman
63a91e9ee0 Merge "Split mac_permissions.xml into plat and non-plat components."
am: b8888197c6

Change-Id: Id0785ec8105d31cb8dd21780be3552588c4ce9e8
2016-12-15 20:27:32 +00:00
dcashman
f976eae6f3 Split mac_permissions.xml into plat and non-plat components.
am: 15171f641e

Change-Id: Ic2ad780d79f58d8fcffffcae7e3aaefda5b4be4f
2016-12-15 20:26:40 +00:00
Treehugger Robot
b8888197c6 Merge "Split mac_permissions.xml into plat and non-plat components." 2016-12-15 20:13:29 +00:00
dcashman
15171f641e Split mac_permissions.xml into plat and non-plat components.
Bug: 31363362
Test: Bullhead and Sailfish both build and boot w/out new denials.
Change-Id: Id7e29ec09510741c4e925231401a6de81704fbf0
2016-12-15 10:04:25 -08:00
Dan Willemsen
4f1d1d0a1e Merge "Remove variables exported by Soong" am: f61205d5c7
am: da8f49522d

Change-Id: I09c678146df1537df9e0f02eb112db031374f04c
2016-12-15 07:34:41 +00:00
Dan Willemsen
da8f49522d Merge "Remove variables exported by Soong"
am: f61205d5c7

Change-Id: I2140a80261c0062e220656e6017b3142d486176f
2016-12-15 07:27:36 +00:00
Dan Willemsen
b8338be5dc Merge "Don't clean generated java sources when AIDL list changes" am: e9c4079e91
am: c29cf6efb6

Change-Id: I678611486f3f7c2951a02722224d3bbabae49e8b
2016-12-15 07:27:35 +00:00
Treehugger Robot
f61205d5c7 Merge "Remove variables exported by Soong" 2016-12-15 07:19:03 +00:00
Dan Willemsen
c29cf6efb6 Merge "Don't clean generated java sources when AIDL list changes"
am: e9c4079e91

Change-Id: I854de56628e16c12a771f18423274e5409ee374b
2016-12-15 07:13:05 +00:00
Treehugger Robot
e9c4079e91 Merge "Don't clean generated java sources when AIDL list changes" 2016-12-15 07:01:13 +00:00
Dan Willemsen
3c6bba0af0 Don't clean generated java sources when AIDL list changes
AIDL doesn't generate into the intermediate src directory, we pass exact
aidl->java files to the compiler. So there is no need to clean the
intermediate src directory when the aidl file list changes for a module.

Test: None, just code inspection
Change-Id: I01feff7cc399ac5b88b83333a1ac86928d0a81e6
2016-12-14 19:53:54 -08:00
Dan Willemsen
4d08538747 Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert" am: d3cc4950f8
am: bfedf05812

Change-Id: Ic1b4310f3eec77d1dd193589f05f19e1232ed68f
2016-12-15 00:45:09 +00:00
Dan Willemsen
bfedf05812 Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert"
am: d3cc4950f8

Change-Id: Ie22b04f74b035bfbe1985dbb1f5bc82e43d50e4a
2016-12-15 00:38:40 +00:00
Dan Willemsen
d3cc4950f8 Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert" 2016-12-15 00:30:04 +00:00
Dan Willemsen
56c6a9d1ff Remove variables exported by Soong
LLVM_RELEASE_VERSION is unused from envsetup.sh and during product
config loading.  LLVM_PREBUILTS_VERSION is still used in envsetup.sh, so
needs to stay.

Delay reading core/clang/config.mk until after Soong's variables are
read so that we don't need a copy of LLVM_PREBUILTS_BASE.

Test: Compare build-aosp_flounder.ninja
Change-Id: I85b5836a2230838c8f3766fb19c6108fc5c9ca50
2016-12-14 16:27:08 -08:00
Alex Klyubin
9d439f54b1 Merge "Faster auto-detection of APK's minSdkVersion" am: 620686f3c6
am: 1f5e43cb6f

Change-Id: Ic6e4f9ba7941b45a166f75e49d85b951055a42e4
2016-12-14 23:54:36 +00:00
Alex Klyubin
1f5e43cb6f Merge "Faster auto-detection of APK's minSdkVersion"
am: 620686f3c6

Change-Id: Idc1d55388577032f009027170fcf69e72666b793
2016-12-14 23:48:06 +00:00
Alex Klyubin
620686f3c6 Merge "Faster auto-detection of APK's minSdkVersion" 2016-12-14 23:42:13 +00:00
Tao Bao
aff4efc8c1 Merge "releasetools: Add prefix when dumping fingerprints." am: a282ceeb73
am: bf9e4aa53f

Change-Id: I34c65b0de83c16630c576a2f25488bb0b13f5fb9
2016-12-14 21:06:56 +00:00
Tao Bao
bf9e4aa53f Merge "releasetools: Add prefix when dumping fingerprints."
am: a282ceeb73

Change-Id: I233432e2a64cc52409129a8ef628461f31e700c9
2016-12-14 21:00:25 +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
Treehugger Robot
a282ceeb73 Merge "releasetools: Add prefix when dumping fingerprints." 2016-12-14 20:53:02 +00:00
Tao Bao
f9023856ad releasetools: Add prefix when dumping fingerprints.
We used to dump "Source: <fingerprint>" in update logs. The "Source: "
prefix was unintentionally dropped out.

Test: Check the generated incremental BBOTA script.
Change-Id: I4de62333aa38e3fb09a76df0e769b62af48e0313
2016-12-14 11:53:38 -08:00
Dan Willemsen
1f7aae0ac2 Merge "Implement LOCAL_TEST_DATA to ship data with tests" am: dd0e69d47f
am: 04cf52edab

Change-Id: I49c20d55c5fd7af70b536b530d3a747e788e3931
2016-12-14 04:08:57 +00:00
Dan Willemsen
04cf52edab Merge "Implement LOCAL_TEST_DATA to ship data with tests"
am: dd0e69d47f

Change-Id: I48e88dde1e93d25a4981036e952eddac669f99f3
2016-12-14 04:02:27 +00:00
Treehugger Robot
dd0e69d47f Merge "Implement LOCAL_TEST_DATA to ship data with tests" 2016-12-14 03:52:31 +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
0e9ae8095b Merge changes I761c90cd,I0e2dd0af into nyc-dev am: cb4af5774a am: a74871cfd3 am: 32e254e258
am: 2d08201d3b

Change-Id: I783aefe051f60100dff27cad415108cd693869e0
2016-12-14 00:40:54 +00:00
Adam Seaton
94fbbd200e Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e
am: 89e9059995

Change-Id: Iee0a4138b5293e3c2ad6b6017548b029a99c88fd
2016-12-14 00:40:49 +00:00