Commit Graph

32436 Commits

Author SHA1 Message Date
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
William Roberts ca3dbe4ab8 fs_config: support parsing android_filesystem_config.h
am: 64edf5bb97

Change-Id: I95702e7e4ccefc9cb5c71710a8e8f2d5b3fbff80
2016-12-10 00:20:41 +00:00
William Roberts ce24636551 fs_config: modularize fs_config_generator
am: 11c29283ec

Change-Id: I3383ea79aded814c16d53bc18b36c27810f26163
2016-12-10 00:20:35 +00:00
Elliott Hughes 1b2de51881 Merge changes from topic 'fsconfig-2'
* changes:
  fs_config: add unit tests
  fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement
  fs_config: add group to build
  fs_config: introduce group generator
  fs_config: add passwd to build
  fs_config: introduce passwd generator
  fs_config: generate friendly in AID class
  fs_config: limit characters for AID_<name> sections
  fs_config: generate oem AID header file
  fs_config: android_id header generator
  fs_config: support parsing android_filesystem_config.h
  fs_config: modularize fs_config_generator
2016-12-10 00:13:05 +00:00
Colin Cross 3ae5fc64bf Merge "Add more module targets for host, host-cross, host32, host64"
am: 77ea32f378

Change-Id: I2d0b355290235842f1d033a90645d6c071864c4b
2016-12-09 22:59:50 +00:00
Treehugger Robot 77ea32f378 Merge "Add more module targets for host, host-cross, host32, host64" 2016-12-09 22:55:00 +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 c645e17388 Merge "Pass eng product varible to soong"
am: b39165d5df

Change-Id: I88acb79aaa12ec9ea2ac0847abf7f8406ccb479d
2016-12-08 23:47:04 +00:00
Colin Cross b39165d5df Merge "Pass eng product varible to soong" 2016-12-08 23:42:17 +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
Andreas Gampe 2017f8dcd5 Merge "Build: Skip JNI lib symlink in second-stage build"
am: 6d4123aeb8

Change-Id: I38f45b7466015234de8bbe2a5ed1b3e9cfda3582
2016-12-07 17:40:41 +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 ad47e9ff84 Merge "build_image: add support for specifying number of inodes"
am: c5fd94f2c3

Change-Id: Ief00b12390472ff6f7c206fe9652fd687f47ffcc
2016-12-07 07:12:11 +00:00
Pat Tjin c5fd94f2c3 Merge "build_image: add support for specifying number of inodes" 2016-12-07 07:07:26 +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 ab0ae8e728 Merge "custom_image: fix build break"
am: 52897d4ecb

Change-Id: I40f0d7c6f935e33f7d076313d86df25fb5199087
2016-12-07 03:26: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
Benoit Lamarche fcf364b15a Merge "Disable Jack's NNode cache"
am: 3c731228ba

Change-Id: Iea59e0c4cd0fa11277913d70a9de698565ae13fc
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