Commit Graph

32507 Commits

Author SHA1 Message Date
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 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 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 da8f49522d Merge "Remove variables exported by Soong"
am: f61205d5c7

Change-Id: I2140a80261c0062e220656e6017b3142d486176f
2016-12-15 07:27:36 +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 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 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 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 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
Dan Willemsen 0ab11a22ba Merge "Sort and reorganize clear_vars.mk to make merges easier"
am: e26036ad5e

Change-Id: I60b8b084e4db3d041cd9fdebd789e7b2b797312c
2016-12-13 22:28:08 +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 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
Paul Duffin 34e4a7b7fd Merge "Use legacy-test instead of core-junit"
am: e28eb9ff0e

Change-Id: I9f08137ad0795bfd48f1fb36fa4ed6313af7cc3c
2016-12-13 09:44:25 +00:00
Paul Duffin e28eb9ff0e Merge "Use legacy-test instead of core-junit" 2016-12-13 09:34:17 +00:00
Elliott Hughes 57cc36a33b Merge "Revert "Merge changes from topic 'fsconfig-2'""
am: 95cee3b0e6

Change-Id: I280306551f365febf206c451e4d7df04f697f50c
2016-12-13 04:34:09 +00:00
Elliott Hughes e472384a4b Revert "Merge changes from topic 'fsconfig-2'"
am: fad4b4b715

Change-Id: I34f415419dc050f5e6d4fe1fc30b896d7e3edb1b
2016-12-13 04:34:07 +00:00
Elliott Hughes 95cee3b0e6 Merge "Revert "Merge changes from topic 'fsconfig-2'"" 2016-12-13 04:23:50 +00:00
Elliott Hughes fad4b4b715 Revert "Merge changes from topic 'fsconfig-2'"
This reverts commit 1b2de51881, reversing
changes made to 77ea32f378.
2016-12-12 17:28:44 -08:00
Dan Willemsen 22c01a60e4 Merge "Fix PDK dupbuild issues"
am: d1b10b20f6

Change-Id: I8185087dd90009c5203549ac1cea111fc921d7d7
2016-12-10 07:21:49 +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
Elliott Hughes 82b189dcee Merge changes from topic 'fsconfig-2'
am: 1b2de51881

Change-Id: I07622a3603986c42195089eb75e37a22cdba6517
2016-12-10 00:23:56 +00:00
William Roberts bd19c0cd23 fs_config: add unit tests
am: 92ec0ab5e8

Change-Id: I7afc692257d31a09cd1bdcab2ed6d8835e56fa51
2016-12-10 00:21:34 +00:00
William Roberts ee9af6edfb fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement
am: 7fe8b6d817

Change-Id: Ie209bc0f1696ffdc5f167d229fc9f5378f8feb24
2016-12-10 00:21:28 +00:00
William Roberts bdbafb5c38 fs_config: add group to build
am: 2127b35526

Change-Id: Icf5e4946bb6d53f2c8080a1327543ffb5a59531c
2016-12-10 00:21:23 +00:00
William Roberts 3315954861 fs_config: introduce group generator
am: 1c4721c3c5

Change-Id: I2eccb5f0d39a3740f540b683fb332df405728c4f
2016-12-10 00:21:17 +00:00
William Roberts 788899790d fs_config: add passwd to build
am: 6d5e0c5df2

Change-Id: Ie912558d2258b3996fc4a5864f2c72e9781a3e62
2016-12-10 00:21:12 +00:00
William Roberts 62d75469b1 fs_config: introduce passwd generator
am: 316f9462af

Change-Id: I9c4c7b5fb1c384b97bf2be09a1d4d683c56c662d
2016-12-10 00:21:07 +00:00
William Roberts 092fa031cd fs_config: generate friendly in AID class
am: 8f42ce71ac

Change-Id: I958aa6152a2b42bb7a82fe1e909fc911a08b2f36
2016-12-10 00:21:02 +00:00
William Roberts 7fcf246c3b fs_config: limit characters for AID_<name> sections
am: 5f059a7691

Change-Id: Ie5be98d61bc5920dbe2055f0432b94a3b1c07110
2016-12-10 00:20:57 +00:00
William Roberts 9652abfeb4 fs_config: generate oem AID header file
am: cfc51f5347

Change-Id: I540683cf1b648ec7445ab204c2bf9ccaf396943e
2016-12-10 00:20:51 +00:00
William Roberts 04fdcc9edf fs_config: android_id header generator
am: d7104bca65

Change-Id: I96a721690d4e145aa859c5c23e3e892e9ce983c9
2016-12-10 00:20:46 +00:00