OSDN Git Service
William Roberts [Sat, 10 Dec 2016 00:36:21 +0000 (00:36 +0000)]
fs_config: introduce passwd generator am:
316f9462af am:
62d75469b1
am:
13be8e4305
Change-Id: I9a8681f10746bad905225f52d6774ace3799973c
William Roberts [Sat, 10 Dec 2016 00:36:14 +0000 (00:36 +0000)]
fs_config: generate friendly in AID class am:
8f42ce71ac am:
092fa031cd
am:
aa200330c5
Change-Id: I25a0a9b2b0d115bdf127501a316999a49c9ffab9
William Roberts [Sat, 10 Dec 2016 00:36:08 +0000 (00:36 +0000)]
fs_config: limit characters for AID_<name> sections am:
5f059a7691 am:
7fcf246c3b
am:
10db3e3cb9
Change-Id: I1e3435f190488ac485363ac5736541ba3ead96e0
William Roberts [Sat, 10 Dec 2016 00:36:02 +0000 (00:36 +0000)]
fs_config: generate oem AID header file am:
cfc51f5347 am:
9652abfeb4
am:
64ab591155
Change-Id: Id2ac5a7049ab783cda0f53ccca4ded9a37ced788
William Roberts [Sat, 10 Dec 2016 00:35:55 +0000 (00:35 +0000)]
fs_config: android_id header generator am:
d7104bca65 am:
04fdcc9edf
am:
343bee6044
Change-Id: I2594c976cecdf72592112697e5c31efd3a1fb75c
William Roberts [Sat, 10 Dec 2016 00:35:48 +0000 (00:35 +0000)]
fs_config: support parsing android_filesystem_config.h am:
64edf5bb97 am:
ca3dbe4ab8
am:
5302f1815c
Change-Id: I17197d4bba0a22719647966bbfa789278a31b5da
William Roberts [Sat, 10 Dec 2016 00:35:41 +0000 (00:35 +0000)]
fs_config: modularize fs_config_generator am:
11c29283ec am:
ce24636551
am:
6ebc4026a7
Change-Id: I8cf03f48ac2c799c71d62b951e26793faadad336
William Roberts [Sat, 10 Dec 2016 00:26:29 +0000 (00:26 +0000)]
fs_config: introduce passwd generator am:
316f9462af
am:
62d75469b1
Change-Id: Ibf6e46a92371ee3f75281a97deb70e821ff03143
William Roberts [Sat, 10 Dec 2016 00:26:22 +0000 (00:26 +0000)]
fs_config: generate friendly in AID class am:
8f42ce71ac
am:
092fa031cd
Change-Id: Iabccf9d097b360ea15ee2a62700fc5199814c7dd
William Roberts [Sat, 10 Dec 2016 00:26:14 +0000 (00:26 +0000)]
fs_config: limit characters for AID_<name> sections am:
5f059a7691
am:
7fcf246c3b
Change-Id: Ia4c77315c8f85c9e5c77f4b0802facd7a8b2161a
William Roberts [Sat, 10 Dec 2016 00:26:07 +0000 (00:26 +0000)]
fs_config: generate oem AID header file am:
cfc51f5347
am:
9652abfeb4
Change-Id: Iea9bf8d8b8c5e98b199cf1413f47b5e00fa5d695
William Roberts [Sat, 10 Dec 2016 00:25:59 +0000 (00:25 +0000)]
fs_config: android_id header generator am:
d7104bca65
am:
04fdcc9edf
Change-Id: If18da87d7010c49f26743f602dffd56745278cde
William Roberts [Sat, 10 Dec 2016 00:25:52 +0000 (00:25 +0000)]
fs_config: support parsing android_filesystem_config.h am:
64edf5bb97
am:
ca3dbe4ab8
Change-Id: Ibd0d33ec543cd570300a026c33d3d76d9b44b007
William Roberts [Sat, 10 Dec 2016 00:25:44 +0000 (00:25 +0000)]
fs_config: modularize fs_config_generator am:
11c29283ec
am:
ce24636551
Change-Id: Icc16415fe5896e5b9b081c98b60d2ac1be302413
William Roberts [Sat, 10 Dec 2016 00:21:07 +0000 (00:21 +0000)]
fs_config: introduce passwd generator
am:
316f9462af
Change-Id: I9c4c7b5fb1c384b97bf2be09a1d4d683c56c662d
William Roberts [Sat, 10 Dec 2016 00:21:02 +0000 (00:21 +0000)]
fs_config: generate friendly in AID class
am:
8f42ce71ac
Change-Id: I958aa6152a2b42bb7a82fe1e909fc911a08b2f36
William Roberts [Sat, 10 Dec 2016 00:20:57 +0000 (00:20 +0000)]
fs_config: limit characters for AID_<name> sections
am:
5f059a7691
Change-Id: Ie5be98d61bc5920dbe2055f0432b94a3b1c07110
William Roberts [Sat, 10 Dec 2016 00:20:51 +0000 (00:20 +0000)]
fs_config: generate oem AID header file
am:
cfc51f5347
Change-Id: I540683cf1b648ec7445ab204c2bf9ccaf396943e
William Roberts [Sat, 10 Dec 2016 00:20:46 +0000 (00:20 +0000)]
fs_config: android_id header generator
am:
d7104bca65
Change-Id: I96a721690d4e145aa859c5c23e3e892e9ce983c9
William Roberts [Sat, 10 Dec 2016 00:20:41 +0000 (00:20 +0000)]
fs_config: support parsing android_filesystem_config.h
am:
64edf5bb97
Change-Id: I95702e7e4ccefc9cb5c71710a8e8f2d5b3fbff80
William Roberts [Sat, 10 Dec 2016 00:20:35 +0000 (00:20 +0000)]
fs_config: modularize fs_config_generator
am:
11c29283ec
Change-Id: I3383ea79aded814c16d53bc18b36c27810f26163
Colin Cross [Fri, 9 Dec 2016 23:11:21 +0000 (23:11 +0000)]
Merge "Add more module targets for host, host-cross, host32, host64" am:
77ea32f378 am:
3ae5fc64bf
am:
06699bbd7d
Change-Id: Ia49441e96dc0a3cbe7dda898698fd774d18fbe48
Colin Cross [Fri, 9 Dec 2016 23:05:51 +0000 (23:05 +0000)]
Merge "Add more module targets for host, host-cross, host32, host64" am:
77ea32f378
am:
3ae5fc64bf
Change-Id: I7f5475de0c3c415ffca2629b835a6012a3bb4897
Colin Cross [Fri, 9 Dec 2016 22:59:50 +0000 (22:59 +0000)]
Merge "Add more module targets for host, host-cross, host32, host64"
am:
77ea32f378
Change-Id: I2d0b355290235842f1d033a90645d6c071864c4b
Treehugger Robot [Fri, 9 Dec 2016 22:54:59 +0000 (22:54 +0000)]
Merge "Add more module targets for host, host-cross, host32, host64"
Colin Cross [Fri, 9 Dec 2016 21:08:27 +0000 (13:08 -0800)]
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
Colin Cross [Thu, 8 Dec 2016 23:56:32 +0000 (23:56 +0000)]
Merge "Pass eng product varible to soong" am:
b39165d5df am:
c645e17388
am:
43e52e594d
Change-Id: I300dedf8f3e8879d93c7679338b86dfd687161d6
Colin Cross [Thu, 8 Dec 2016 23:52:01 +0000 (23:52 +0000)]
Merge "Pass eng product varible to soong" am:
b39165d5df
am:
c645e17388
Change-Id: Id4a4d650d784a55d26b3d3aa22111c4dc5acde84
Colin Cross [Thu, 8 Dec 2016 23:47:04 +0000 (23:47 +0000)]
Merge "Pass eng product varible to soong"
am:
b39165d5df
Change-Id: I88acb79aaa12ec9ea2ac0847abf7f8406ccb479d
Colin Cross [Thu, 8 Dec 2016 23:42:16 +0000 (23:42 +0000)]
Merge "Pass eng product varible to soong"
Android Build Merger (Role) [Thu, 8 Dec 2016 19:30:15 +0000 (19:30 +0000)]
Merge changes from topic 'am-
f0bc0c2fe07747f8a5e9fb7955126ec6' into nyc-mr2-dev-plus-aosp
* changes:
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e am:
ab8c6b7e33 am:
920376a35a am:
5260c53a72 am:
6640e36cb0
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371 am:
7ab9da0e3e am:
39fc3e057b am:
d23021bb6a am:
4752ccd6e5
Adam Seaton [Thu, 8 Dec 2016 19:29:48 +0000 (19:29 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e am:
ab8c6b7e33 am:
920376a35a am:
5260c53a72
am:
35e183e051
Change-Id: I4e783511dc20e843c4fa72c93ec44ebc91262fa1
Adam Seaton [Thu, 8 Dec 2016 19:29:48 +0000 (19:29 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e am:
ab8c6b7e33 am:
920376a35a am:
5260c53a72
am:
6640e36cb0
Change-Id: I18ae14633de8e47f1772eb22741b986b375c0577
Adam Seaton [Thu, 8 Dec 2016 19:29:41 +0000 (19:29 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371 am:
7ab9da0e3e am:
39fc3e057b am:
d23021bb6a
am:
55409e843c
Change-Id: I3a16f059fc47b0c45b2b93a62ee4152586300e44
Adam Seaton [Thu, 8 Dec 2016 19:29:41 +0000 (19:29 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371 am:
7ab9da0e3e am:
39fc3e057b am:
d23021bb6a
am:
4752ccd6e5
Change-Id: I8cbe3959296a02d579eb474f2a1bc570c7dffa54
Adam Seaton [Thu, 8 Dec 2016 19:25:17 +0000 (19:25 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e am:
ab8c6b7e33 am:
920376a35a
am:
5260c53a72
Change-Id: Ic5680e80d403f77c5b45d59d74139f142572bb2f
Adam Seaton [Thu, 8 Dec 2016 19:25:17 +0000 (19:25 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e am:
ab8c6b7e33 am:
920376a35a
am:
5260c53a72
Change-Id: I4aa031380560608c0cfc6dec05dda722841fedcb
Adam Seaton [Thu, 8 Dec 2016 19:25:10 +0000 (19:25 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371 am:
7ab9da0e3e am:
39fc3e057b
am:
d23021bb6a
Change-Id: I4ce4629476866c46f8e81565d24fc86d26621d71
Adam Seaton [Thu, 8 Dec 2016 19:25:10 +0000 (19:25 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371 am:
7ab9da0e3e am:
39fc3e057b
am:
d23021bb6a
Change-Id: I5209e73495eae704c1a1ce9441f556ed37624561
Adam Seaton [Thu, 8 Dec 2016 19:20:16 +0000 (19:20 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e am:
ab8c6b7e33
am:
920376a35a
Change-Id: I9eb5927b353df59bc2f4d6ca9b8b0959fa605185
Adam Seaton [Thu, 8 Dec 2016 19:20:10 +0000 (19:20 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371 am:
7ab9da0e3e
am:
39fc3e057b
Change-Id: I3319a70c835fcc6f4caec0f0f331c80b0bfff849
Adam Seaton [Thu, 8 Dec 2016 19:16:48 +0000 (19:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e
am:
ab8c6b7e33
Change-Id: I08505a341bce3869628b6f09157332bf5bb0d1d5
Adam Seaton [Thu, 8 Dec 2016 19:16:40 +0000 (19:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371
am:
7ab9da0e3e
Change-Id: Icc44a43eefe8db0fcd9191b10ce6e2517ce56f99
Adam Seaton [Thu, 8 Dec 2016 19:11:15 +0000 (19:11 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours
am:
80d094259e
Change-Id: I90763143c525a186c503abccc6f710fb851d72b6
Adam Seaton [Thu, 8 Dec 2016 19:11:10 +0000 (19:11 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours
am:
4758581371
Change-Id: Ib67b4e7043da863341e0e9d2f79a3e9fed0a7351
Adam Seaton [Thu, 8 Dec 2016 19:06:44 +0000 (19:06 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87
am:
31bc4666be -s ours
Change-Id: I0ec36bbce6a7ec254360eb3133f99813b5de5aa0
Adam Seaton [Thu, 8 Dec 2016 19:06:39 +0000 (19:06 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7
am:
0c30223c15 -s ours
Change-Id: I9a6046de21e024e5f3378047411e5270881aa2d3
Adam Seaton [Thu, 8 Dec 2016 19:02:14 +0000 (19:02 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b
am:
7a2ca27f87
Change-Id: Iafe15e8f02674cf82a933464256e0d1d14549c3f
Adam Seaton [Thu, 8 Dec 2016 19:02:09 +0000 (19:02 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c
am:
e76d1419c7
Change-Id: I376173b292e1e26c5de1147312caa94f0a531af1
Adam Seaton [Thu, 8 Dec 2016 18:57:13 +0000 (18:57 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac
am:
4e1976ff9b
Change-Id: I1e2194c66c28220d6f8d2c2b8f12e63f420dc39b
Adam Seaton [Thu, 8 Dec 2016 18:57:09 +0000 (18:57 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7
am:
6083d8337c
Change-Id: I1f2345cf0ebce7f0124cc235a4bdeee8e9c32dfc
Adam Seaton [Thu, 8 Dec 2016 18:53:13 +0000 (18:53 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev
am:
06e7d1f2ac
Change-Id: I964c1abe8c27142f30b570877681e13dd38d4aca
Adam Seaton [Thu, 8 Dec 2016 18:53:08 +0000 (18:53 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev
am:
f92880e0c7
Change-Id: Ib50d3f7d336d9e6b6f7edcac63c8927fc17aa780
Colin Cross [Thu, 8 Dec 2016 18:05:55 +0000 (10:05 -0800)]
Pass eng product varible to soong
Test: mmma -j frameworks/compile/libbcc
Change-Id: I79a903528948b728f730385a9de5e431617ff257
Adam Seaton [Wed, 7 Dec 2016 22:58:43 +0000 (14:58 -0800)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev
Change-Id: Iefaf98b1fe24e70f1262a432b6edc792383acf8e
Adam Seaton [Wed, 7 Dec 2016 22:57:17 +0000 (14:57 -0800)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev
Change-Id: I4563c5d9176d690676402f671971e46a484cadc0
Andreas Gampe [Wed, 7 Dec 2016 17:48:41 +0000 (17:48 +0000)]
Merge "Build: Skip JNI lib symlink in second-stage build" am:
6d4123aeb8 am:
2017f8dcd5
am:
f15272ed0b
Change-Id: Ibb1c2f48f4e26006387fbb0c987654b7e62502be
Andreas Gampe [Wed, 7 Dec 2016 17:44:42 +0000 (17:44 +0000)]
Merge "Build: Skip JNI lib symlink in second-stage build" am:
6d4123aeb8
am:
2017f8dcd5
Change-Id: I0a41ecd96b1ff2348fe66a1e349288d02927a8c1
Andreas Gampe [Wed, 7 Dec 2016 17:40:41 +0000 (17:40 +0000)]
Merge "Build: Skip JNI lib symlink in second-stage build"
am:
6d4123aeb8
Change-Id: I38f45b7466015234de8bbe2a5ed1b3e9cfda3582
Treehugger Robot [Wed, 7 Dec 2016 17:35:53 +0000 (17:35 +0000)]
Merge "Build: Skip JNI lib symlink in second-stage build"
Pat Tjin [Wed, 7 Dec 2016 07:20:15 +0000 (07:20 +0000)]
Merge "build_image: add support for specifying number of inodes" am:
c5fd94f2c3 am:
ad47e9ff84
am:
171df483c3
Change-Id: I294be7dd4a3c0f904f0ac6c00517e30435797663
Pat Tjin [Wed, 7 Dec 2016 07:15:44 +0000 (07:15 +0000)]
Merge "build_image: add support for specifying number of inodes" am:
c5fd94f2c3
am:
ad47e9ff84
Change-Id: I8deedae7be71ac3eda13b109447799919861132b
Pat Tjin [Wed, 7 Dec 2016 07:12:11 +0000 (07:12 +0000)]
Merge "build_image: add support for specifying number of inodes"
am:
c5fd94f2c3
Change-Id: Ief00b12390472ff6f7c206fe9652fd687f47ffcc
Pat Tjin [Wed, 7 Dec 2016 07:07:25 +0000 (07:07 +0000)]
Merge "build_image: add support for specifying number of inodes"
Patrick Tjin [Thu, 20 Oct 2016 17:58:12 +0000 (10:58 -0700)]
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
b59eca358603a4174d4f7c9b70749e7cd0e6f3fe)
bowgotsai [Wed, 7 Dec 2016 03:34:30 +0000 (03:34 +0000)]
Merge "custom_image: fix build break" am:
52897d4ecb am:
ab0ae8e728
am:
882fc2c96a
Change-Id: Ie01865b817d2b87b9411a1ed82739d0b7b9a6a5a
bowgotsai [Wed, 7 Dec 2016 03:30:30 +0000 (03:30 +0000)]
Merge "custom_image: fix build break" am:
52897d4ecb
am:
ab0ae8e728
Change-Id: I20aa30f30bafcfb49b39c0d69b87ed5e7e4ecae5
bowgotsai [Wed, 7 Dec 2016 03:26:30 +0000 (03:26 +0000)]
Merge "custom_image: fix build break"
am:
52897d4ecb
Change-Id: I40f0d7c6f935e33f7d076313d86df25fb5199087
Treehugger Robot [Wed, 7 Dec 2016 03:20:12 +0000 (03:20 +0000)]
Merge "custom_image: fix build break"
Andreas Gampe [Wed, 7 Dec 2016 01:56:29 +0000 (17:56 -0800)]
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
Benoit Lamarche [Tue, 6 Dec 2016 16:01:46 +0000 (16:01 +0000)]
Merge "Disable Jack's NNode cache" am:
3c731228ba am:
fcf364b15a
am:
90965a5f69
Change-Id: I2fd6bb30513f4d3c53f147894c399e2044b9ec52
Benoit Lamarche [Tue, 6 Dec 2016 15:58:15 +0000 (15:58 +0000)]
Merge "Disable Jack's NNode cache" am:
3c731228ba
am:
fcf364b15a
Change-Id: Id19d1caf7ce00809f907dbca51fed607ebbe3f2d
Benoit Lamarche [Tue, 6 Dec 2016 15:54:45 +0000 (15:54 +0000)]
Merge "Disable Jack's NNode cache"
am:
3c731228ba
Change-Id: Iea59e0c4cd0fa11277913d70a9de698565ae13fc
Benoit Lamarche [Tue, 6 Dec 2016 15:47:34 +0000 (15:47 +0000)]
Merge "Disable Jack's NNode cache"
Benoit Lamarche [Tue, 6 Dec 2016 14:00:03 +0000 (15:00 +0100)]
Disable Jack's NNode cache
Test: N/A
Bug:
33367537
Change-Id: Idf7a518dfcbf5665917465b1ae2f0e09f4532688
Benoit Lamarche [Tue, 6 Dec 2016 11:16:05 +0000 (11:16 +0000)]
resolve merge conflicts of
e04c941 to stage-aosp-master am:
0e61b46673
am:
dd80dde8d2
Change-Id: Iff9f1ef1653a7a878dee9fb23dc7398e2b3805fc
Benoit Lamarche [Tue, 6 Dec 2016 11:11:58 +0000 (11:11 +0000)]
resolve merge conflicts of
e04c941 to stage-aosp-master
am:
0e61b46673
Change-Id: I988764ab18ddd8ae3219c0c4c73b4b92e7e83abb
Benoit Lamarche [Tue, 6 Dec 2016 10:32:41 +0000 (11:32 +0100)]
resolve merge conflicts of
e04c941 to stage-aosp-master
Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
Benoit Lamarche [Tue, 6 Dec 2016 10:16:25 +0000 (10:16 +0000)]
Merge "Set platform min sdk for Jack to o-b1"
bowgotsai [Tue, 6 Dec 2016 09:30:44 +0000 (17:30 +0800)]
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
Dan Willemsen [Tue, 6 Dec 2016 03:40:35 +0000 (03:40 +0000)]
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am:
47b0322534 am:
0deb783a52
am:
54eac255b9
Change-Id: Ic11fff505eac936ec0e3897f8565fd65f4f917d4
Dan Willemsen [Tue, 6 Dec 2016 03:36:34 +0000 (03:36 +0000)]
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am:
47b0322534
am:
0deb783a52
Change-Id: Icb3d257945201bdfdff1fb562d06faf3c009788d
Dan Willemsen [Tue, 6 Dec 2016 03:32:05 +0000 (03:32 +0000)]
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR"
am:
47b0322534
Change-Id: I55ac26073caf34173f6c051f87e10b651c23589b
Treehugger Robot [Tue, 6 Dec 2016 03:27:00 +0000 (03:27 +0000)]
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR"
Dan Willemsen [Tue, 6 Dec 2016 02:37:58 +0000 (02:37 +0000)]
Merge "Remove aidl, proto, objc from soong_problems" am:
bbc072f716 am:
55b1651181
am:
35ab684f8e
Change-Id: If0557ff6e3dcb44335ab781bec929846fbdf82a9
Dan Willemsen [Tue, 6 Dec 2016 02:34:58 +0000 (02:34 +0000)]
Merge "Remove aidl, proto, objc from soong_problems" am:
bbc072f716
am:
55b1651181
Change-Id: Ia18925f8aebf81bcd8707d29f88eef5fa7b6cee0
Dan Willemsen [Tue, 6 Dec 2016 02:32:31 +0000 (02:32 +0000)]
Merge "Soong now exports AIDL_CPP" am:
06a2daac72 am:
f1e23b77f4
am:
66509c37dc
Change-Id: I1687e78bdbdb11d1c39ddd4f5492f4276672b0a6
Dan Willemsen [Tue, 6 Dec 2016 02:32:30 +0000 (02:32 +0000)]
Merge "Remove aidl, proto, objc from soong_problems"
am:
bbc072f716
Change-Id: Ifba3b1ebb0e9ca018495fc1f93104823d51a516e
Treehugger Robot [Tue, 6 Dec 2016 02:28:35 +0000 (02:28 +0000)]
Merge "Remove aidl, proto, objc from soong_problems"
Dan Willemsen [Tue, 6 Dec 2016 02:28:30 +0000 (02:28 +0000)]
Merge "Soong now exports AIDL_CPP" am:
06a2daac72
am:
f1e23b77f4
Change-Id: I0aa93e2a1eb2803b46c70019eee23d08a47b4c9d
Dan Willemsen [Tue, 6 Dec 2016 02:25:36 +0000 (02:25 +0000)]
Merge "Soong now exports AIDL_CPP"
am:
06a2daac72
Change-Id: I704c568b71cd95c6a17545d6694095b72e5c097c
Treehugger Robot [Tue, 6 Dec 2016 02:20:39 +0000 (02:20 +0000)]
Merge "Soong now exports AIDL_CPP"
Dan Willemsen [Tue, 6 Dec 2016 01:46:14 +0000 (17:46 -0800)]
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
Dan Willemsen [Tue, 6 Dec 2016 00:38:14 +0000 (16:38 -0800)]
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
Dan Willemsen [Mon, 5 Dec 2016 23:16:38 +0000 (15:16 -0800)]
Soong now exports AIDL_CPP
So remove it here.
Test: mmma -j system/tools/aidl
Change-Id: Ia92ce6499881c1aec42900fcfdb4e790a67b62b5
Adrien Schildknecht [Sat, 3 Dec 2016 04:15:00 +0000 (04:15 +0000)]
Manually merge commit '
c13da91' into stage-aosp-master am:
ada51f3b8f
am:
13f3b5337a
Change-Id: Ib9400831dd32ca00ab5c7ba9e115f6b5f9b0439f
Adrien Schildknecht [Sat, 3 Dec 2016 04:12:53 +0000 (04:12 +0000)]
Manually merge commit '
c13da91' into stage-aosp-master
am:
ada51f3b8f
Change-Id: Idc324a9e89bd4bf7e099395a72b5868d7040d545
The Android Automerger [Sat, 3 Dec 2016 04:02:09 +0000 (04:02 +0000)]
Manually merge commit '
c13da91' into stage-aosp-master
* commit '
c13da91':
Add support for creating ext4 images with mke2fs
BUG:
33304034
Treehugger Robot [Fri, 2 Dec 2016 22:48:21 +0000 (22:48 +0000)]
Merge "Add support for creating ext4 images with mke2fs"
dcashman [Fri, 2 Dec 2016 22:42:53 +0000 (22:42 +0000)]
Merge "Sort SELinux package inclusion." am:
15e1b5e239 am:
d1b032237a
am:
59f8c3f59a
Change-Id: I18621f461565a3b30a884d54229502fd1ba15766
OSDN Git Service
