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
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
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