Commit graph

32306 commits

Author SHA1 Message Date
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
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
e28eb9ff0e Merge "Use legacy-test instead of core-junit" 2016-12-13 09:34:17 +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
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
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
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
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
Treehugger Robot
6d4123aeb8 Merge "Build: Skip JNI lib symlink in second-stage build" 2016-12-07 17:35:53 +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
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
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
Dan Willemsen
0deb783a52 Merge "Tell Soong about TARGET_COPY_OUT_VENDOR"
am: 47b0322534

Change-Id: I55ac26073caf34173f6c051f87e10b651c23589b
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
55b1651181 Merge "Remove aidl, proto, objc from soong_problems"
am: bbc072f716

Change-Id: Ifba3b1ebb0e9ca018495fc1f93104823d51a516e
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
f1e23b77f4 Merge "Soong now exports AIDL_CPP"
am: 06a2daac72

Change-Id: I704c568b71cd95c6a17545d6694095b72e5c097c
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
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
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
dcashman
d1b032237a Merge "Sort SELinux package inclusion."
am: 15e1b5e239

Change-Id: I2411d85662baf7278d34955bd6eb7ae6938b1956
2016-12-02 22:36:28 +00:00
Treehugger Robot
15e1b5e239 Merge "Sort SELinux package inclusion." 2016-12-02 22:25:42 +00:00
Colin Cross
51c1eeefb3 Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES"
am: 1498712a6b

Change-Id: Iec7d58d837879bc4a63818d09881873f56d14779
2016-12-02 22:00:26 +00:00
Colin Cross
1498712a6b Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" 2016-12-02 21:47:58 +00:00
dcashman
c316783843 Sort SELinux package inclusion.
This section will be modified as part of splitting these packages into platform
and non-platform components.  Sort them all to avoid conflicts.

Bug: 31363362
Test: Builds
Change-Id: I91fb4d4d7c0a6971a19047ef2eb2981770a122ff
2016-12-02 09:34:23 -08:00
Tao Bao
d07f9995b8 Merge "Build recovery-two-step.img for two-step OTAs."
am: 06e14e438f

Change-Id: I9c5d6e5f71da88bc0f662373335b024a55ca193e
2016-12-02 15:19:00 +00:00
Tao Bao
06e14e438f Merge "Build recovery-two-step.img for two-step OTAs." 2016-12-02 15:09:13 +00:00
Yohann Roussel
5360e0160b Set platform min sdk for Jack to o-b1
Test: m core-all
(cherry picked from commit 94acfe908b3e70cdd11920c92715ef06de7ed212)

Change-Id: I26a558677f2fa8ede09ad1ae7f31b786c4ba0a43
2016-12-02 08:36:24 +00:00
Tao Bao
d42e97ebb4 Build recovery-two-step.img for two-step OTAs.
In two-step OTAs, we write recovery image to /boot as the first step so
that we can reboot from there and install a new recovery image to
/recovery. However, bootloader will show "Your device is corrupt"
message when booting /boot with the recovery image. Because the recovery
image encodes the path of "/recovery" as part of the signature metadata,
which fails the verified boot.

This CL generates a special "recovery-two-step.img" in addition to the
regular recovery.img. This image encodes "/boot" when being signed,
which will be flashed to /boot at stage 1/3 in a two-step OTA.

Here are the desired changes:

- 'IMAGES/recovery-two-step.img' exists in target_files.zip for non-A/B
targets (e.g. bullhead). The image should not exist for targets that
don't have a recovery partition (e.g. A/B devices like sailfish).

- <device>-img.zip should not contain 'recovery-two-step.img'.

- Nothing should change when building non-two-step OTAs. For two-step
OTAs, 'recovery-two-step.img' should be included in the OTA package;
'updater-script' should flash this image to /boot at stage 1/3.

- When building a two-step OTA with an input TF.zip that doesn't have
  IMAGES/recovery-two-step.img, it should use the existing
  IMAGES/recovery.img instead.

Bug: 32986477
Test: Tested the steps above on bullhead and sailfish.
Change-Id: I34e6c599bcf2011d4cd5c926999418b3975d6d0f
2016-12-01 17:47:59 -08:00
Pirama Arumuga Nainar
0cc559f7d8 Merge "Do not *directly* package libbcc.so"
am: ec0d7cbc49

Change-Id: I15871b1ca4cb5fa5488721a5f6a21bfa2a72feab
2016-12-01 18:11:13 +00:00
Pirama Arumuga Nainar
ec0d7cbc49 Merge "Do not *directly* package libbcc.so" 2016-12-01 17:58:47 +00:00
Tao Bao
2e3f1c5258 Merge "releasetools: Remove dead parameter in GetBootableImage()."
am: 8df4fea85f

Change-Id: I192af3927849d0d8f995f0002b8b8f2e191b794f
2016-12-01 17:09:07 +00:00
Tao Bao
8df4fea85f Merge "releasetools: Remove dead parameter in GetBootableImage()." 2016-12-01 17:02:07 +00:00
Paul Duffin
74f8ee05de Merge "Replace core-junit with legacy-test"
am: 32cc1f80e5

Change-Id: Id425eff2aaafdf8ad63bc66ef2d28f71d32d6e8b
2016-12-01 10:42:16 +00:00