OSDN Git Service
Vishwath Mohan [Mon, 23 May 2016 22:29:50 +0000 (22:29 +0000)]
Merge "Double quote some statements for zsh compatibility" am:
576fd3ebb9
am:
29c2c4db19
* commit '
29c2c4db19c6c9f152a1c48aee368a3439cd195f':
Double quote some statements for zsh compatibility
Change-Id: Id02db06a190370d18e3b7828a453cd16948d77c1
Vishwath Mohan [Mon, 23 May 2016 22:25:45 +0000 (22:25 +0000)]
Merge "Double quote some statements for zsh compatibility"
am:
576fd3ebb9
* commit '
576fd3ebb92d2200ea8c02cd6f3b7ba21ced9030':
Double quote some statements for zsh compatibility
Change-Id: I30ff4c9d527907772d11d557097fafb2cbeeb590
Colin Cross [Mon, 23 May 2016 22:21:46 +0000 (22:21 +0000)]
Merge "Error on USE_CLANG_PLATFORM_BUILD=" am:
7b31dd1094
am:
893f32053f
* commit '
893f32053f78def4582ceb54b19ddb1253b73495':
Error on USE_CLANG_PLATFORM_BUILD=
Change-Id: Ibc43aee7aecb6526436be08e78622a2e4690e71c
Vishwath Mohan [Mon, 23 May 2016 22:17:35 +0000 (22:17 +0000)]
Merge "Double quote some statements for zsh compatibility"
Colin Cross [Mon, 23 May 2016 22:17:34 +0000 (22:17 +0000)]
Merge "Error on USE_CLANG_PLATFORM_BUILD="
am:
7b31dd1094
* commit '
7b31dd10948abccc9c8b2f949edbe84de15702d5':
Error on USE_CLANG_PLATFORM_BUILD=
Change-Id: Iea742a5cd8230587656460cc5ad6b979ba2189a5
Colin Cross [Mon, 23 May 2016 22:05:27 +0000 (22:05 +0000)]
Merge "Error on USE_CLANG_PLATFORM_BUILD="
Dan Willemsen [Mon, 23 May 2016 21:32:01 +0000 (21:32 +0000)]
Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE" am:
c11ae6c569
am:
8b0af507d9
* commit '
8b0af507d97b4e93bbe8d6afbc33d7840478729e':
Add LOCAL_CTS_GTEST_LIST_EXECUTABLE
Change-Id: Ibb4ff3b5b972ed3f7a35c122b6da1ee18de1212f
Dan Willemsen [Mon, 23 May 2016 21:28:36 +0000 (21:28 +0000)]
Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE"
am:
c11ae6c569
* commit '
c11ae6c569c26607a165e6fe491008bdd272d981':
Add LOCAL_CTS_GTEST_LIST_EXECUTABLE
Change-Id: Id305d60c8db698fa90b09fb547f606b62bb37ad9
Treehugger Robot [Mon, 23 May 2016 21:18:57 +0000 (21:18 +0000)]
Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE"
Andreas Gampe [Mon, 23 May 2016 20:48:00 +0000 (20:48 +0000)]
Merge "Build: Only use compiled-classes file when available" into nyc-dev
am:
57c3aea442
* commit '
57c3aea442bff67e4452eee7ff8f13294fbad34b':
Build: Only use compiled-classes file when available
Change-Id: I9a3ae7385483f9f5d934d8cd6660c17c57529989
Vikas Marwaha [Mon, 23 May 2016 20:39:56 +0000 (20:39 +0000)]
Merge "Build: Only use compiled-classes file when available" into nyc-dev
Alex Klyubin [Mon, 23 May 2016 19:34:12 +0000 (19:34 +0000)]
Merge "Improve concurrency for JAR entry inspection requests." am:
ac68c28831
am:
304cb0f015
* commit '
304cb0f015889334d6f7e75a92cc6ed8c4ce6c52':
Improve concurrency for JAR entry inspection requests.
Change-Id: I837fbdfdd3d3af654a8cc31ecd89ec0077e1fba1
Alex Klyubin [Mon, 23 May 2016 19:31:14 +0000 (19:31 +0000)]
Merge "Improve concurrency for JAR entry inspection requests."
am:
ac68c28831
* commit '
ac68c28831f3947e47a924cb677b740975dbbc6f':
Improve concurrency for JAR entry inspection requests.
Change-Id: I144f7c3f60e8a95785fcdd380e98df867a84bd70
Alex Klyubin [Mon, 23 May 2016 19:26:14 +0000 (19:26 +0000)]
Merge "Improve concurrency for JAR entry inspection requests."
Dan Willemsen [Mon, 23 May 2016 17:43:38 +0000 (17:43 +0000)]
Merge "Move to a single clang unknown flags list" am:
06935290ac
am:
315621eee0
* commit '
315621eee0a1199b175ab4d251ea617fdb018fd5':
Move to a single clang unknown flags list
Change-Id: I209bf8b868da7b11d55fc6cf701976ff914a2160
Dan Willemsen [Mon, 23 May 2016 17:40:42 +0000 (17:40 +0000)]
Merge "Move to a single clang unknown flags list"
am:
06935290ac
* commit '
06935290ac12d03a5a4f287f4743ada996305235':
Move to a single clang unknown flags list
Change-Id: Ia02030229a089e531c7258780fb7837240e2b47f
Dan Willemsen [Mon, 23 May 2016 17:30:18 +0000 (17:30 +0000)]
Merge "Move to a single clang unknown flags list"
Baligh Uddin [Sat, 21 May 2016 00:31:19 +0000 (00:31 +0000)]
Merge commit \'
9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev
am:
0418406186
* commit '
0418406186f67096a3c42fa276799095620e2296':
Add Oem Props to otatools package
Change-Id: Ib278834d9237965f9f663508ff312fad89ef920a
Baligh Uddin [Sat, 21 May 2016 00:27:18 +0000 (17:27 -0700)]
Baligh Uddin [Sat, 21 May 2016 00:14:04 +0000 (17:14 -0700)]
Baligh Uddin [Sat, 21 May 2016 00:04:37 +0000 (00:04 +0000)]
Merge commit \'
8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
am:
275af3429f
* commit '
275af3429f3049378862883dc6a0db2701f9311f':
Add Oem Props to otatools package
Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8
Baligh Uddin [Fri, 20 May 2016 23:59:14 +0000 (16:59 -0700)]
Baligh Uddin [Fri, 20 May 2016 23:50:56 +0000 (23:50 +0000)]
Merge commit \'
c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b\' into lmp-mr1-ub-dev
am:
50cae53b10
* commit '
50cae53b10b7e6a18fe6016bd5dc9eaba715545d':
Add Oem Props to otatools package
Change-Id: I4ca967ea935f4a3a5c709047ca2ed486d196e974
Baligh Uddin [Fri, 20 May 2016 23:44:27 +0000 (16:44 -0700)]
Andreas Gampe [Fri, 20 May 2016 18:05:38 +0000 (11:05 -0700)]
Build: Only use compiled-classes file when available
Don't pull in things from frameworks/base when they're not there.
Bug:
28878540
Change-Id: Ida8a5e4e46dc5cd5bdedc4bb66640abb4969e1f3
Baligh Uddin [Fri, 20 May 2016 18:43:25 +0000 (18:43 +0000)]
Add Oem Props to otatools package
am:
4f8df41cef
* commit '
4f8df41ceff7434ece651737b15bf1035f5549e8':
Add Oem Props to otatools package
Change-Id: I2b5ba1bb090c5144f4ea0b17153352eb31b46e7f
Baligh Uddin [Fri, 20 May 2016 18:29:53 +0000 (11:29 -0700)]
Add Oem Props to otatools package
Bug:
23967152
Dan Willemsen [Thu, 19 May 2016 21:39:25 +0000 (14:39 -0700)]
Move to a single clang unknown flags list
Soong is using a single list of unknown clang flags for all
architectures, instead of the per-architecture list here. Collapse this
down to a single list as well so that it can be verified against the
Soong list, and eventually replaced by the Soong version.
Change-Id: If43cd892105da5155907c05965a74b835920a369
Dan Willemsen [Thu, 19 May 2016 22:20:34 +0000 (22:20 +0000)]
Merge "Remove (C|CPP|CONLY|LD)FLAGS checked by Soong" am:
15409e8f20
am:
c78767f66d
* commit '
c78767f66d06f2edd46e10fcc5c1ee2053565549':
Remove (C|CPP|CONLY|LD)FLAGS checked by Soong
Change-Id: I9e63f52a421f9a4358887fdb76c055b51d7903ea
Dan Willemsen [Thu, 19 May 2016 22:18:04 +0000 (22:18 +0000)]
Merge "Remove (C|CPP|CONLY|LD)FLAGS checked by Soong"
am:
15409e8f20
* commit '
15409e8f20195edce9ccda48836082e4c6bad4f8':
Remove (C|CPP|CONLY|LD)FLAGS checked by Soong
Change-Id: I412ec02d9825f6f6c857df84744b198e7ce9901a
Dan Willemsen [Thu, 19 May 2016 22:09:45 +0000 (22:09 +0000)]
Merge "Remove (C|CPP|CONLY|LD)FLAGS checked by Soong"
Colin Cross [Thu, 19 May 2016 19:59:54 +0000 (12:59 -0700)]
Error on USE_CLANG_PLATFORM_BUILD=
A blank USE_CLANG_PLATFORM_BUILD= on the command line for make causes
confusion between make and kati. make ignores writes to variables set
on the command line, so envsetup.mk cannot set it to true,
USE_CLANG_PLATFORM_BUILD is still empty in soong.mk, and soong.variables
gets DeviceUsesClang: false. kati gets USE_CLANG_PLATFORM_BUILD= in its
environment instead of on its command line, so envsetup.mk when parsed
by kati sets USE_CLANG_PLATFORM_BUILD=true.
Error out early if USE_CLANG_PLATFORM_BUILD is not true or false after
attempting to set it to true if it is empty.
Change-Id: I0e2731315711db9a6ac6ea2bf49c88bccacd35f7
Alan Viverette [Thu, 19 May 2016 19:48:49 +0000 (19:48 +0000)]
Merge "Add documents-archive to SDK, docs builds" into nyc-dev
am:
88b0d6a63d
* commit '
88b0d6a63d8149d14032d298eccde79a6d3079d4':
Add documents-archive to SDK, docs builds
Change-Id: I2c07f2f20da849174d23dfe6ab5c81008c37c6b1
Alan Viverette [Thu, 19 May 2016 19:39:10 +0000 (19:39 +0000)]
Merge "Add documents-archive to SDK, docs builds" into nyc-dev
Vishwath Mohan [Fri, 11 Mar 2016 18:00:40 +0000 (10:00 -0800)]
Double quote some statements for zsh compatibility
Two eval commands did not enclose their arguments in double quotes, and
this broke compatibility on zsh - preventing lunch from running to
completion. This CL adds the double quotes and fixes the issue.
Change-Id: I5ed884b455e2e61182f6c29fb807ed92372af039
Baligh Uddin [Thu, 19 May 2016 16:56:20 +0000 (16:56 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am:
74da4d6eef am:
cea440c2eb am:
9606ea8a43 -s ours
am:
3c42a21466
* commit '
3c42a2146612209e7b8eab749cbafe7f0782e942':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: I173d5494f192dc907ae5e6db1e6318bfe66b38c4
Baligh Uddin [Thu, 19 May 2016 16:52:12 +0000 (16:52 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am:
74da4d6eef am:
cea440c2eb
am:
9606ea8a43 -s ours
* commit '
9606ea8a4306ac2be9b3d9c17ad7dc890cf25170':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Ia925f396973716d5fcd3120a74b0c44ad99a99fc
Baligh Uddin [Thu, 19 May 2016 16:47:58 +0000 (16:47 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am:
74da4d6eef
am:
cea440c2eb
* commit '
cea440c2ebb8982158adc8bebf3a4cd85a5950fd':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Ia8380c1e5f81d7225baee928ba2a35290aca4f85
Baligh Uddin [Thu, 19 May 2016 16:43:34 +0000 (16:43 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
am:
74da4d6eef
* commit '
74da4d6eef1da6490729dfbd069adf913d9aa6fa':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Iefc0f7c90f631d6298931c9426d8edfbb60aa437
Baligh Uddin [Thu, 19 May 2016 15:50:19 +0000 (08:50 -0700)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
otatools.zip is used to release key sign device images.
Bug:
23967152
Andreas Gampe [Thu, 19 May 2016 05:10:55 +0000 (05:10 +0000)]
Build: Use phone compiled-classes in core_minimal
am:
695b28f67c
* commit '
695b28f67c88b87486911f8881078e7857e989a8':
Build: Use phone compiled-classes in core_minimal
Change-Id: I3b3a362c17c741994b34a2f70301806eadf9098d
Andreas Gampe [Thu, 19 May 2016 03:10:43 +0000 (20:10 -0700)]
Build: Use phone compiled-classes in core_minimal
Use default phone compiled-classes list to cut down boot image
size on most devices.
Bug:
28026683
Change-Id: I73bb59b792923ebc7549f775085b1c9aed88cc1a
Dan Willemsen [Thu, 19 May 2016 01:26:05 +0000 (01:26 +0000)]
Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am:
e23a49157f
am:
84eb1d2cca
* commit '
84eb1d2ccad40ecffa989fe0babf1c4a9c589f0a':
Windows: Stop adding to GLOBAL_LD_DIRS
Change-Id: I4e8de34d50c0ab9e57e2f7c3801b2e1b4d9a981b
Dan Willemsen [Thu, 19 May 2016 01:23:22 +0000 (01:23 +0000)]
Merge "Windows: Stop adding to GLOBAL_LD_DIRS"
am:
e23a49157f
* commit '
e23a49157f34a3c3f82115a117908d32b14a6262':
Windows: Stop adding to GLOBAL_LD_DIRS
Change-Id: I8b834feed668c311169ec5da294414f47d4175be
Dan Willemsen [Thu, 19 May 2016 00:39:04 +0000 (17:39 -0700)]
Remove (C|CPP|CONLY|LD)FLAGS checked by Soong
At the beginning of every build, Soong has exported its version of these
variables, and has been ensuring that when sorted, the result is the
same. So these variables all have the same flags of the Soong ones, but
may be in different orders. We don't believe any of the remaining order
differences matter. As we remove the Make definitions, the exported
Soong variables will take over.
This only removes lines that change one of these variables:
[2ND_][CLANG_]HOST_CROSS_GLOBAL_CFLAGS
[2ND_][CLANG_]HOST_CROSS_GLOBAL_CONLYFLAGS
[2ND_][CLANG_]HOST_CROSS_GLOBAL_CPPFLAGS
[2ND_][CLANG_]HOST_CROSS_GLOBAL_LDFLAGS
[2ND_][CLANG_]HOST_GLOBAL_CFLAGS
[2ND_][CLANG_]HOST_GLOBAL_CONLYFLAGS
[2ND_][CLANG_]HOST_GLOBAL_CPPFLAGS
[2ND_][CLANG_]HOST_GLOBAL_LDFLAGS
[2ND_][CLANG_]TARGET_GLOBAL_CFLAGS
[2ND_][CLANG_]TARGET_GLOBAL_CONLYFLAGS
[2ND_][CLANG_]TARGET_GLOBAL_CPPFLAGS
[2ND_][CLANG_]TARGET_GLOBAL_LDFLAGS
Many other variables are unnecessary now too, but those will be removed
in another change. For those we can ensure the build.ninja file does not
change, but we expect it to change here due to the ordering differences.
Change-Id: I0bd0778706d02ee27b2784dd8dc6b2c71d37bd3a
Dan Willemsen [Thu, 19 May 2016 01:09:28 +0000 (01:09 +0000)]
Merge "Windows: Stop adding to GLOBAL_LD_DIRS"
Dan Willemsen [Thu, 19 May 2016 00:08:00 +0000 (00:08 +0000)]
Merge "Remove trailing newline from TARGET_C_INCLUDES" am:
6864e3790c
am:
cb0bccf423
* commit '
cb0bccf42335b4f389e1e3efa2f8681e9b0b2abe':
Remove trailing newline from TARGET_C_INCLUDES
Change-Id: Ibdaec09f72aa7831a141e1130700840235569d8b
Dan Willemsen [Thu, 19 May 2016 00:05:26 +0000 (00:05 +0000)]
Merge "Remove trailing newline from TARGET_C_INCLUDES"
am:
6864e3790c
* commit '
6864e3790c80d3044307f0d260cf0e2b962ae82d':
Remove trailing newline from TARGET_C_INCLUDES
Change-Id: I615050a58cca90291f2c07cae4397a711c69e585
Dan Willemsen [Wed, 18 May 2016 23:18:13 +0000 (16:18 -0700)]
Windows: Stop adding to GLOBAL_LD_DIRS
Soong does not have the idea of global linking directories, so move the
windows prebuilt library directory to GLOBAL_LDFLAGS instead.
Change-Id: Ie101146f4682cd85924463aa5acaa46869938e6c
Dan Willemsen [Wed, 18 May 2016 23:50:27 +0000 (23:50 +0000)]
Merge "Remove trailing newline from TARGET_C_INCLUDES"
Dan Willemsen [Wed, 18 May 2016 22:36:37 +0000 (15:36 -0700)]
Remove trailing newline from TARGET_C_INCLUDES
In preparation for comparing with the Soong variable.
Change-Id: I159507757ed7678a33a3c94e6d01d170485e251a
Alex Light [Wed, 18 May 2016 21:20:40 +0000 (21:20 +0000)]
Merge "Add fake libart" am:
49a4be8130
am:
c7e74a370a
* commit '
c7e74a370aaf3fa6c31e6552b90f6e95fe217d06':
Add fake libart
Change-Id: I320a4d810a611b59410330ce1c48936d63158705
Alex Light [Wed, 18 May 2016 21:17:09 +0000 (21:17 +0000)]
Merge "Add fake libart"
am:
49a4be8130
* commit '
49a4be81304d2292bb6bd67ddaabe759d9e8c273':
Add fake libart
Change-Id: Iacc59ada5b3323c81a8c70464f5634ab722c4f2b
Alex Light [Wed, 18 May 2016 21:05:41 +0000 (21:05 +0000)]
Merge "Add fake libart"
Dan Willemsen [Wed, 18 May 2016 20:55:07 +0000 (20:55 +0000)]
Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" am:
ac7a7bb0ba
am:
611211acd4
* commit '
611211acd40bc02773d27568d4774d8061149c52':
Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
Change-Id: I6744e92b392c02dfcbe2154d13823a5a0a3b7693
Dan Willemsen [Wed, 18 May 2016 20:52:31 +0000 (20:52 +0000)]
Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS"
am:
ac7a7bb0ba
* commit '
ac7a7bb0ba7b864a07ceb159dcd6a8b177866fb3':
Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
Change-Id: I7e880084b72d90dc4de16fd674692b53b1e67de2
Treehugger Robot [Wed, 18 May 2016 20:45:19 +0000 (20:45 +0000)]
Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS"
Dan Willemsen [Wed, 18 May 2016 19:50:53 +0000 (12:50 -0700)]
Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
We never use it for host modules, and all the target configurations use
the same linker argument. This matches Soong.
Change-Id: Ibcba9a4ce340c7a12306d1fee620a04027c0e292
Alex Klyubin [Wed, 18 May 2016 16:25:46 +0000 (16:25 +0000)]
Merge "Uncompress native libs only if they are compressed." into nyc-dev
am:
451b72438e
* commit '
451b72438e974a10f3f9062ced5d455d3234e4dd':
Uncompress native libs only if they are compressed.
Change-Id: I4c680cfb228774ce93e75c644e7eee5c40988399
TreeHugger Robot [Wed, 18 May 2016 16:17:17 +0000 (16:17 +0000)]
Merge "Uncompress native libs only if they are compressed." into nyc-dev
Alex Light [Fri, 15 Apr 2016 17:19:02 +0000 (10:19 -0700)]
Add fake libart
Bug:
27775991
Change-Id: I54cbdf2340dcfdd9b3973d9d10c8bd94492736fb
(cherry picked from commit
6da74d8f1f0a06366fe93b885dc26f53401ec6b4)
Dan Willemsen [Wed, 18 May 2016 00:43:02 +0000 (00:43 +0000)]
Merge "Remove make variables exported from Soong" am:
30b57cd7d5
am:
f85807f794
* commit '
f85807f794266ccebbcba8aaf2732b1fb945519d':
Remove make variables exported from Soong
Change-Id: I453366e23996f4b68acc5367146829050f00798e
Dan Willemsen [Wed, 18 May 2016 00:43:01 +0000 (00:43 +0000)]
Merge "Pass BUILD_HOST_static to Soong" am:
3b0990cbdc
am:
700b0f868e
* commit '
700b0f868e8200fb5c7c30b35155867606229247':
Pass BUILD_HOST_static to Soong
Change-Id: I0fddac56a5bf4feb5e5049b96c7d75912eb0d021
Dan Willemsen [Wed, 18 May 2016 00:40:31 +0000 (00:40 +0000)]
Merge "Remove make variables exported from Soong"
am:
30b57cd7d5
* commit '
30b57cd7d5459c69fbd4332b988b5e636b529f4d':
Remove make variables exported from Soong
Change-Id: I2b7a6baf5d8a8b3b0bb52e8fc4b16a5616f8f939
Dan Willemsen [Wed, 18 May 2016 00:40:30 +0000 (00:40 +0000)]
Merge "Pass BUILD_HOST_static to Soong"
am:
3b0990cbdc
* commit '
3b0990cbdc941b584fb3000f76607c2a8065b603':
Pass BUILD_HOST_static to Soong
Change-Id: I8292e35b7ca3fe14133b8675dbf8d6c54736e5aa
Dan Willemsen [Wed, 18 May 2016 00:36:46 +0000 (00:36 +0000)]
Merge "Remove make variables exported from Soong"
Treehugger Robot [Wed, 18 May 2016 00:33:07 +0000 (00:33 +0000)]
Merge "Pass BUILD_HOST_static to Soong"
Dan Willemsen [Tue, 17 May 2016 23:40:03 +0000 (16:40 -0700)]
Pass BUILD_HOST_static to Soong
Change-Id: I0ac43a1dedf20e5251e05f12d120d0e6e2e1b1ee
Stefan De Clercq [Tue, 17 May 2016 20:56:59 +0000 (20:56 +0000)]
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev am:
2937ec60ea -s ours
am:
9497f830a2
* commit '
9497f830a25f90ed63b06a2f2636a9c99edd9979':
Add SDK 10 and 11 to list of supported Mac SDKs
Change-Id: Ia7c8b3244047cd7072feb9027608651d46ba07b4
Stefan De Clercq [Tue, 17 May 2016 20:53:09 +0000 (20:53 +0000)]
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev
am:
2937ec60ea -s ours
* commit '
2937ec60ea64b5e1e821b40a227542b1d95b5bb4':
Add SDK 10 and 11 to list of supported Mac SDKs
Change-Id: I9dfc020e3f9083a02fc831b86294af0f26891526
Alex Klyubin [Tue, 17 May 2016 20:33:34 +0000 (13:33 -0700)]
Uncompress native libs only if they are compressed.
This changes the build system to uncompress native libraries in
preinstalled APKs only if the libraries are actually compressed.
Previously, any preinstalled APK containing native libraries was
modified by having all native libraries removed from the APK and then
re-added to the APK in uncompressed form.
Bug:
27887819
Change-Id: I3db172133e141bb6282bf3ed7070b068a826724e
Stefan De Clercq [Tue, 17 May 2016 20:09:01 +0000 (20:09 +0000)]
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev
Dan Willemsen [Tue, 17 May 2016 19:54:53 +0000 (19:54 +0000)]
Merge "Remove redundant clang cppflags" am:
8bbed5a635
am:
51c38fe13f
* commit '
51c38fe13f8812f77a2aa9f76657f10f19ee07de':
Remove redundant clang cppflags
Change-Id: I49886cb27b60fca17de25f6be193383b40c0c936
Dan Willemsen [Tue, 17 May 2016 19:51:27 +0000 (19:51 +0000)]
Merge "Remove redundant clang cppflags"
am:
8bbed5a635
* commit '
8bbed5a6350a2a7ca1eb7d0886b783fa5b681180':
Remove redundant clang cppflags
Change-Id: Ic45e02c74ec154bc74b42dd12df2c162b4a862ce
Dan Willemsen [Tue, 17 May 2016 19:46:23 +0000 (19:46 +0000)]
Merge "Remove redundant clang cppflags"
Dan Willemsen [Tue, 17 May 2016 07:41:25 +0000 (00:41 -0700)]
Remove redundant clang cppflags
Cppflags always get added to cflags, so we don't need to duplicate clang
cppflags extras that are already in the clang cflags extras
Change-Id: Ic099f565f20fd993fc0713c033fbc5154373c98f
Shinichiro Hamaji [Tue, 17 May 2016 04:08:25 +0000 (04:08 +0000)]
Merge "Make apks depend on their certificates" am:
f0a465c2cb
am:
f562875d0c
* commit '
f562875d0c232b91be9a0931d30c31b1bbb98c45':
Make apks depend on their certificates
Change-Id: I28f5f91a6265201136cdf83c18c7ada359bb4d33
Shinichiro Hamaji [Tue, 17 May 2016 04:05:46 +0000 (04:05 +0000)]
Merge "Make apks depend on their certificates"
am:
f0a465c2cb
* commit '
f0a465c2cb5921762d7d17d65cd7352d0f64c261':
Make apks depend on their certificates
Change-Id: I1f89af20d7d4cb337a91203631ff68eb654b0e0c
Shinichiro Hamaji [Tue, 17 May 2016 03:58:31 +0000 (03:58 +0000)]
Merge "Make apks depend on their certificates"
Dan Willemsen [Mon, 16 May 2016 08:42:58 +0000 (01:42 -0700)]
Remove make variables exported from Soong
These have all been strictly checked by Soong, so the values currently
match. Just remove them so that the make variables exported by Soong
will take over.
This also removes some of the GCC reconfiguration, since we haven't
implemented that in Soong. If it becomes useful in the future, we'll
implement it there.
Some things like TARGET_TOOCHAIN_ROOT can nearly be removed, but are
used before the Soong-exported make_vars.mk is loaded. In that case,
added to the clang cflags, so it can be removed once the cflags are
removed.
Others, like LLVM_PREBUILTS_VERSION are loaded even earlier -- in
envsetup.sh before we've even configured Soong. So for now, keep the
Make definition, and continue ensuring it's the same as the Soong
version.
Change-Id: I554b27062ac43610828a8c06d640d919a2dc21ca
Dan Willemsen [Tue, 17 May 2016 03:05:32 +0000 (03:05 +0000)]
Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV" am:
a794f4db22
am:
19fdc4428f
* commit '
19fdc4428f9036b059a1174a3236eef03180e826':
Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV
Change-Id: I143bf88ad5031764644dfb2c8b279513c809b50b
Dan Willemsen [Tue, 17 May 2016 03:03:01 +0000 (03:03 +0000)]
Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV"
am:
a794f4db22
* commit '
a794f4db220d0f357773a037d842f40ab463485f':
Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV
Change-Id: I7b1fcc43e7c2260632c61e29f0d6bfb41df1b812
Dan Willemsen [Tue, 17 May 2016 02:53:50 +0000 (02:53 +0000)]
Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV"
Amith Yamasani [Tue, 17 May 2016 00:33:05 +0000 (00:33 +0000)]
Merge "Add CtsShimPrebuilt" into nyc-dev
am:
85c33f500a
* commit '
85c33f500aa2ef7c70c1644617e7439b97f22a79':
Add CtsShimPrebuilt
Change-Id: I604118ab69b52d8965f30ef3f8e0d841a4d7a288
Amith Yamasani [Tue, 17 May 2016 00:27:54 +0000 (00:27 +0000)]
Merge "Add CtsShimPrebuilt" into nyc-dev
Dan Willemsen [Mon, 16 May 2016 21:41:49 +0000 (14:41 -0700)]
Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV
Instead, use the libgcc/libatomic/libgcov from the static libraries dir,
which is provided by Soong. Copy the libraries using the Soong script if
Soong is disabled - this can be removed once USE_SOONG is removed.
Change-Id: Iad2ad20ad5c3cfc48bf1e46e594a482609098d7a
Billy Lamberta [Mon, 16 May 2016 22:26:58 +0000 (22:26 +0000)]
docs: work minisite am:
09304b21b3 am:
05f772fe6b
am:
f06c24f0c1
* commit '
f06c24f0c1b06aaf24637c1392cd61f9bb52f66f':
docs: work minisite
Change-Id: I14e93ea722cef48c8dd4ee056fa8cdb1056128ec
Billy Lamberta [Mon, 16 May 2016 22:21:47 +0000 (22:21 +0000)]
docs: work minisite am:
09304b21b3
am:
05f772fe6b
* commit '
05f772fe6bb53190477d6b92e8098d53994cfdbf':
docs: work minisite
Change-Id: Ifff07a8a5d6b5aa9011226ec8d512f5e800ff4df
Billy Lamberta [Mon, 16 May 2016 22:15:52 +0000 (22:15 +0000)]
docs: work minisite
am:
09304b21b3
* commit '
09304b21b33f13480d4df58b53df89e6e1356537':
docs: work minisite
Change-Id: I3ee5ddd408506dbdce2168e8aeaa3a1a87442005
Billy Lamberta [Tue, 3 May 2016 22:28:41 +0000 (15:28 -0700)]
docs: work minisite
Changes needed to build the new directory
frameworks/base/docs/html/work. Support for
resource cards and navigation.
bug:
27744376
Change-Id: I8556eb0e2cf86eb83be395a97306d220394827cd
Amith Yamasani [Fri, 13 May 2016 18:25:07 +0000 (11:25 -0700)]
Add CtsShimPrebuilt
It was needed for a CTS test but was accidentally
left out?
Bug:
28398205
Change-Id: I7deea60e6b11bc11d3bd8e82170fc42df7cec3c7
Alex Klyubin [Mon, 16 May 2016 17:21:37 +0000 (17:21 +0000)]
Merge "No need to JAR-sign OTA update packages." am:
094caf99aa
am:
5e09800c76
* commit '
5e09800c7623f172368ebc426ee7987ea787cba7':
No need to JAR-sign OTA update packages.
Change-Id: I0da7e308c93a459a1152f95bdafad4e67997275d
Alex Klyubin [Mon, 16 May 2016 17:18:20 +0000 (17:18 +0000)]
Merge "No need to JAR-sign OTA update packages."
am:
094caf99aa
* commit '
094caf99aab48c7ef62fd635503a0c70c18ecfde':
No need to JAR-sign OTA update packages.
Change-Id: I0a0e73cc5f64ba20600c30b9f304b0ff06705693
Alex Klyubin [Mon, 16 May 2016 17:11:04 +0000 (17:11 +0000)]
Merge "No need to JAR-sign OTA update packages."
Alan Viverette [Mon, 16 May 2016 15:04:45 +0000 (15:04 +0000)]
Merge "Add missing support library projects to pathmap" into mnc-ub-dev am:
5b30101722
am:
c608284d22
* commit '
c608284d22b95733e6b3a24f84084d9268eeabdf':
Add missing support library projects to pathmap
Change-Id: I480d62e803903c7421826a8a368c66ac8eef57a8
Alan Viverette [Mon, 16 May 2016 15:01:38 +0000 (15:01 +0000)]
Merge "Add missing support library projects to pathmap" into mnc-ub-dev
am:
5b30101722
* commit '
5b3010172211583034d1cf5eac41583dae79d77a':
Add missing support library projects to pathmap
Change-Id: Ia5c43c59bd4ff26a2d1069f38205ee7a5de2181b
Alan Viverette [Mon, 16 May 2016 14:56:01 +0000 (14:56 +0000)]
Merge "Add missing support library projects to pathmap" into mnc-ub-dev
Joe Fernandez [Mon, 16 May 2016 01:16:27 +0000 (01:16 +0000)]
docs: Wear Preview - update TOC navigation behavior am:
f8e4e54b89 am:
f9601a7ad2
am:
f1ed84693e
* commit '
f1ed84693e5be34bebeafe1eb78a2f0cb6041b65':
docs: Wear Preview - update TOC navigation behavior
Change-Id: Ib24e9f48cf9c4ced46d43bfe056489aaf28ce9bc
Joe Fernandez [Mon, 16 May 2016 01:13:40 +0000 (01:13 +0000)]
docs: Wear Preview - update TOC navigation behavior am:
f8e4e54b89
am:
f9601a7ad2
* commit '
f9601a7ad261772cf0f89df267de6998fd65cc48':
docs: Wear Preview - update TOC navigation behavior
Change-Id: I4304642d26f0b975cb50bfdd53a04167d186b268
Joe Fernandez [Mon, 16 May 2016 01:10:52 +0000 (01:10 +0000)]
docs: Wear Preview - update TOC navigation behavior
am:
f8e4e54b89
* commit '
f8e4e54b89cf381a725e8be9e05eee2bb94b0f2c':
docs: Wear Preview - update TOC navigation behavior
Change-Id: I9cbf81eec6b55a40d573c0160b7f7936bd0eb621
OSDN Git Service
