OSDN Git Service
Alex Klyubin [Fri, 27 May 2016 20:02:10 +0000 (20:02 +0000)]
Merge "Store entry alignment information in APK."
am:
85f004c6c5
* commit '
85f004c6c5995da4f9175eb65b90f48f601d658d':
Store entry alignment information in APK.
Change-Id: I937cd36edbce072bcf329699f2bd3265205a8a11
Alex Klyubin [Fri, 27 May 2016 19:57:11 +0000 (19:57 +0000)]
Merge "Store entry alignment information in APK."
Colin Cross [Fri, 27 May 2016 00:26:30 +0000 (00:26 +0000)]
Merge "Fix mm and mmm in Android.bp directories"
am:
8ed91b6624
* commit '
8ed91b66240d3071a42365737f4cd5c7dbe601e1':
Fix mm and mmm in Android.bp directories
Change-Id: Id8d80175a2ab27c6ea5a969eb37ad12726e68376
Treehugger Robot [Fri, 27 May 2016 00:23:24 +0000 (00:23 +0000)]
Merge "Fix mm and mmm in Android.bp directories"
Colin Cross [Thu, 26 May 2016 22:32:15 +0000 (15:32 -0700)]
Fix mm and mmm in Android.bp directories
mm and mmm were not parsing out/soong/Android.mk, so they were ignoring
all modules defined in an Android.bp file. Always include
out/soong/Android.mk when ONE_SHOT_MAKEFILE is set, and convert the mm
and mmm functions to build MODULES-IN-$DIR instead of all_modules so
that only the subset of modules defined in out/soong/Android.mk for the
requested directory are built.
Bug:
28986194
Change-Id: I6e1ff8cacfc668a4154a0d5937450db840bb7a6b
Dan Willemsen [Thu, 26 May 2016 21:52:54 +0000 (21:52 +0000)]
Merge "Remove unnecessary variables"
am:
2eb45d9ab2
* commit '
2eb45d9ab29b0923aeeea51ae0c58e32fea23941':
Remove unnecessary variables
Change-Id: I645c34edb93ce262d245867c4efea2d409366a09
Dan Willemsen [Thu, 26 May 2016 21:49:01 +0000 (21:49 +0000)]
Merge "Remove unnecessary variables"
Dan Willemsen [Tue, 17 May 2016 05:07:31 +0000 (22:07 -0700)]
Remove unnecessary variables
These are all either recently unused due to the removal of CFLAGS/etc,
or have been exported by Soong and are no longer necessary.
Change-Id: I5930d43fda21acc8202b3d8ea010fbefb6ae4cf1
Colin Cross [Thu, 26 May 2016 00:57:54 +0000 (00:57 +0000)]
Merge "Remove USE_SOONG=false option"
am:
5413fb4b3e
* commit '
5413fb4b3e2310be8568f5024fdc4d0900bf9f9e':
Remove USE_SOONG=false option
Change-Id: I83c44d57917a10838dd9626d382b4e992c58f822
Colin Cross [Thu, 26 May 2016 00:46:39 +0000 (00:46 +0000)]
Merge "Remove USE_SOONG=false option"
Colin Cross [Wed, 25 May 2016 19:55:43 +0000 (12:55 -0700)]
Remove USE_SOONG=false option
Soong is always required to build now.
Change-Id: I4e310e98e912b370ebf980bf609f04212a7e9a50
Alex Klyubin [Mon, 23 May 2016 21:19:51 +0000 (14:19 -0700)]
Store entry alignment information in APK.
Data of uncompressed APK entries is often aligned to a multiple of 4
or 4096 in the APK to make it easier to mmap the data. Unfortunately,
the current method for achieving alignment suffers from two issues:
(1) the way it uses the Local File Header extra field is not compliant
with ZIP format (for example, this prevents older versions of Python's
zipfile from reading APKs: https://bugs.python.org/issue14315), and
(2) it does not store information about the alignment multiple in the
APK, making it harder/impossible to preserve the intended alignment
when rearranging entries in the APK.
This change solves these issues by switching to a different method for
aligning data of uncompressed APK entries. Same as before, alignment
is achieved using Local File Header entry field. What's different is
that alignment is achieved by placing a well-formed extensible data
field/block into the extra field. The new field/block contains the
alignment multiple (e.g., 4 or 4096) as well as the necessary padding
(if any). Compared to the original alignment method, the new method
uses 6 more bytes for each uncompressed entry.
Bug:
27461702
Change-Id: I8cffbecc50bf634b28fca5bc39eb23f671961cf9
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
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: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"
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: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"
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: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
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
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: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: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: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 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: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
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: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: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"
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
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."
Alex Klyubin [Sat, 14 May 2016 01:44:48 +0000 (18:44 -0700)]
Improve concurrency for JAR entry inspection requests.
This moves the creation of potentially expensive objects from the
thread which creates JAR entry inspection requests, to the thread
which fulfills these requests, increasig concurrency opportunities.
Bug:
27461702
Change-Id: If753b2de7fb04ee5e2e4bbcb27d42269d7fa5def
Dan Willemsen [Fri, 13 May 2016 23:56:11 +0000 (23:56 +0000)]
Merge "Soong: Read Android.soong.mk if skipping Android.mk"
am:
ea71c96894
* commit '
ea71c968943209f41191a1f164f899dd002b9119':
Soong: Read Android.soong.mk if skipping Android.mk
Change-Id: I76aa5c350a26ea718df36f1df4ba5ade3f49a478
Treehugger Robot [Fri, 13 May 2016 23:52:07 +0000 (23:52 +0000)]
Merge "Soong: Read Android.soong.mk if skipping Android.mk"
Dan Willemsen [Fri, 13 May 2016 22:58:52 +0000 (15:58 -0700)]
Soong: Read Android.soong.mk if skipping Android.mk
If Soong is enabled, and we're skipping an Android.mk because there is
an Android.bp file, check for an Android.soong.mk file and read that
instead. This will allow us to temporarily define modules or recurse
into subdirectories that soong does not yet support.
Change-Id: Ifdb2f0204a38a5069e53527f66ffcfb8008c11a4
Colin Cross [Fri, 13 May 2016 22:44:16 +0000 (22:44 +0000)]
Merge "Default USE_SOONG to true"
am:
ac33935ac1
* commit '
ac33935ac1721c640ce39b722cb7471ea9a5949d':
Default USE_SOONG to true
Change-Id: Ie75c39b174b20af51e13bd7f6e0dfdb50d903233
Colin Cross [Fri, 13 May 2016 22:40:23 +0000 (22:40 +0000)]
Merge "Default USE_SOONG to true"
Dan Willemsen [Fri, 13 May 2016 22:33:48 +0000 (22:33 +0000)]
Merge "Don\'t use GTEST_OS_LINUX on Darwin"
am:
439f4dd189
* commit '
439f4dd1895eef8684b3257fe5631a45d51635d6':
Don't use GTEST_OS_LINUX on Darwin
Change-Id: Ie05e2df72a2cbfa52d6b767cd009c36a640ef23e
Evgenii Stepanov [Fri, 13 May 2016 22:33:47 +0000 (22:33 +0000)]
Merge "Pass USE_SAFESTACK to Soong."
am:
00bccf54d4
* commit '
00bccf54d4b3847cf54f6507c8fa29eabf26f2e7':
Pass USE_SAFESTACK to Soong.
Change-Id: I9258135b2debee97b21de27232a7530780a63f5d
Dan Willemsen [Fri, 13 May 2016 22:29:16 +0000 (22:29 +0000)]
Merge "Don't use GTEST_OS_LINUX on Darwin"
Evgenii Stepanov [Fri, 13 May 2016 22:24:52 +0000 (22:24 +0000)]
Merge "Pass USE_SAFESTACK to Soong."
Evgenii Stepanov [Fri, 13 May 2016 01:03:23 +0000 (18:03 -0700)]
Pass USE_SAFESTACK to Soong.
Change-Id: I51a94da0942aa1a1e003c134a30e8da82e1270b8
Dan Willemsen [Wed, 9 Mar 2016 19:01:43 +0000 (11:01 -0800)]
Don't use GTEST_OS_LINUX on Darwin
Change-Id: If77118591daa7b474e6989e03109ea32ddd357b2
Ian Rogers [Fri, 13 May 2016 18:21:57 +0000 (18:21 +0000)]
Merge "Make Error Prone warnings in sync with Error Prone documenation."
am:
86c3b72d9c
* commit '
86c3b72d9c9cb46acd7b8339dc3ce0a2f869fb2f':
Make Error Prone warnings in sync with Error Prone documenation.
Change-Id: I78b111feb108096a9b38c798dd4ee666a6852797
Ian Rogers [Fri, 13 May 2016 18:19:18 +0000 (18:19 +0000)]
Merge "Make Error Prone warnings in sync with Error Prone documenation."
Mohamad Ayyash [Fri, 13 May 2016 18:16:05 +0000 (18:16 +0000)]
Merge "Use fs_config files for mksquashfs"
am:
4730facd73
* commit '
4730facd7399ead0d753d7b588001faf6469e041':
Use fs_config files for mksquashfs
Change-Id: I3c7c7c618e18598cda56f153d9ac8a988ef85510
Treehugger Robot [Fri, 13 May 2016 18:13:22 +0000 (18:13 +0000)]
Merge "Use fs_config files for mksquashfs"
Ian Rogers [Fri, 13 May 2016 15:59:00 +0000 (08:59 -0700)]
Make Error Prone warnings in sync with Error Prone documenation.
Use summary information from annotation within Error Prone to auto-generate
the warnings list.
Bug:
28681096
Change-Id: Ib3a5f734bd229726fcd7332eaa9e0e1bd1200c25
Shinichiro Hamaji [Fri, 13 May 2016 07:03:24 +0000 (16:03 +0900)]
Make apks depend on their certificates
Bug:
27954979
Change-Id: I02db576cb80cbb9dd684d931da02e1b3b3efdf37
Shinichiro Hamaji [Fri, 13 May 2016 05:24:35 +0000 (05:24 +0000)]
Merge "Follow symlinks when using find for assets"
am:
4c4c06016b
* commit '
4c4c06016bfe62fde1aaf2fff33d6f6c55f78b89':
Follow symlinks when using find for assets
Change-Id: I62fc48be86bbbac6e0d2f09e398a4922fe21668a
Shinichiro Hamaji [Fri, 13 May 2016 05:20:05 +0000 (05:20 +0000)]
Merge "Follow symlinks when using find for assets"
Mohamad Ayyash [Fri, 8 Apr 2016 05:10:51 +0000 (22:10 -0700)]
Use fs_config files for mksquashfs
BUG:
27467028
Change-Id: I7648030ad4b31d70a5d439e9552fd2cbfe288b74
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
BUG:
28704419
Dan Willemsen [Fri, 13 May 2016 01:40:48 +0000 (01:40 +0000)]
Merge "Read Soong-exported configuration"
am:
c7b610a67e
* commit '
c7b610a67ebff333cede41d5f336165485c9ae5d':
Read Soong-exported configuration
Change-Id: I0890077c980e0e9d863809bc02fbb8e2f5aa8018
Dan Willemsen [Fri, 13 May 2016 01:36:28 +0000 (01:36 +0000)]
Merge "Read Soong-exported configuration"
Dan Willemsen [Thu, 12 May 2016 20:43:47 +0000 (20:43 +0000)]
Merge "Use product-specific Soong outputs"
am:
f100d01dd5
* commit '
f100d01dd5dde712a19bd75f8f6895b21641bd62':
Use product-specific Soong outputs
Change-Id: I530778730be7424be3d3fbe88fd65fc70d2a0d12
Dan Willemsen [Tue, 29 Mar 2016 19:32:16 +0000 (12:32 -0700)]
Read Soong-exported configuration
This is to ensure that Make and Soong agree on configuration variables
like TARGET_GLOBAL_CFLAGS. Only a few variables are actually checked
currently until we make more actually the same.
Bug:
23566674
Change-Id: Ibede43d933ede4d470e182f9490ea6ec4ef52fbc
Dan Willemsen [Thu, 12 May 2016 20:33:05 +0000 (20:33 +0000)]
Merge "Use product-specific Soong outputs"
Alex Klyubin [Thu, 12 May 2016 18:45:58 +0000 (18:45 +0000)]
Merge "Offer an ApkSignerEngine implementation."
am:
6975f03fd8
* commit '
6975f03fd8b65c294a08ebc40be7da871e9e74d7':
Offer an ApkSignerEngine implementation.
Change-Id: I7ab04e1e9699219bb5204c2b656b47583a399e31
Alex Klyubin [Thu, 12 May 2016 18:43:08 +0000 (18:43 +0000)]
Merge "Offer an ApkSignerEngine implementation."
Alex Klyubin [Thu, 12 May 2016 00:19:07 +0000 (17:19 -0700)]
No need to JAR-sign OTA update packages.
This removes the logic for JAR signing from -w (whole-file signing)
mode. This mode is designed specifically for OTA update packages. When
such packages are verified, their JAR signatures are ignored. Thus,
there is no need to JAR-sign in -w mode.
For context, OTA update packages are protected by a special signature
residing in the ZIP End of Central Directory record (at the very end
of the file). This is the signature verified when update packages are
being applied to Android.
Change-Id: Ia852a11ed6774ce746087cdd7f028b191ef6bc8b
Alex Klyubin [Wed, 11 May 2016 19:48:27 +0000 (12:48 -0700)]
Offer an ApkSignerEngine implementation.
This adds an implementation of ApkSignerEngine to the apksigner-core
library.
Bug:
27461702
Change-Id: I5f977b98555ca507a0dfcd3e92eecb9758aa8370
Shinichiro Hamaji [Thu, 12 May 2016 09:15:28 +0000 (18:15 +0900)]
Follow symlinks when using find for assets
This should have been done in
https://android-review.googlesource.com/#/c/43901/
Bug:
27954979
Change-Id: I663b5e87e0d844d37a59e404219ff5e7e364df74
Shinichiro Hamaji [Thu, 12 May 2016 02:20:36 +0000 (02:20 +0000)]
Merge "Correct some dependencies around zip packages"
am:
b6f2c8fac8
* commit '
b6f2c8fac8246ed7e6a1d25bf9cc0e658504813a':
Correct some dependencies around zip packages
Change-Id: I59e2597e955e69a35edbd0fa13bb1eb4d076b456
Shinichiro Hamaji [Thu, 12 May 2016 02:06:42 +0000 (02:06 +0000)]
Merge "Correct some dependencies around zip packages"
Wei Wang [Wed, 11 May 2016 21:57:08 +0000 (21:57 +0000)]
Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"
am:
648ea82b04
* commit '
648ea82b048a83dfcc68aa3419523502b3a1485f':
Include BRILLO_VENDOR_PARTITIONS in target zip generation
Change-Id: I9aa55d82d8121b66dd853cf434b2a68b4dbbab68
Chih-Hung Hsieh [Wed, 11 May 2016 21:57:03 +0000 (21:57 +0000)]
Merge "Add misc-macro-parentheses to default tidy checks."
am:
a55b7ec4c3
* commit '
a55b7ec4c38f5de172d51e805215505196c7702d':
Add misc-macro-parentheses to default tidy checks.
Change-Id: I2e93d50500ee3c6746aa805f0f6b268c07687c7f
Treehugger Robot [Wed, 11 May 2016 21:49:56 +0000 (21:49 +0000)]
Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"
Treehugger Robot [Wed, 11 May 2016 21:44:20 +0000 (21:44 +0000)]
Merge "Add misc-macro-parentheses to default tidy checks."
Chih-Hung Hsieh [Wed, 11 May 2016 20:39:48 +0000 (13:39 -0700)]
Add misc-macro-parentheses to default tidy checks.
* Disable this check in external projects.
Bug:
28705665
Change-Id: Ia44a15765fd637dae36b5e0f2b59ee4280b139c9
Chih-Hung Hsieh [Wed, 11 May 2016 20:39:19 +0000 (20:39 +0000)]
Merge "Fix misc-macro-parentheses warnings."
am:
bc0ab6d133
* commit '
bc0ab6d1337802a52d2ba07897d58085f128857d':
Fix misc-macro-parentheses warnings.
Change-Id: I3b3d4d2cdcc9e26bdf8cf6cb8586f333421a2a81
Chih-hung Hsieh [Wed, 11 May 2016 20:30:47 +0000 (20:30 +0000)]
Merge "Fix misc-macro-parentheses warnings."
Wei Wang [Wed, 11 May 2016 05:48:13 +0000 (22:48 -0700)]
Include BRILLO_VENDOR_PARTITIONS in target zip generation
This change will enable the target zip to include partition defined in
BRILLO_VENDOR_PARTITIONS. This is necessary for OTA to support
partitions other than boot and system in ab_partitions.txt.
The target zip will include images in BRILLO_VENDOR_PARTITIONS if
defined, under VENDOR_IMAGES/ with path kept. Also any vendor partitions
defined in AB_OTA_PARTITIONS will be copied to IMAGES/ in the target zip.
BUG:
28623063
Change-Id: Ic479048dfb8ac506acf827865e784fcb0432a1d5
Ian Rogers [Wed, 11 May 2016 19:16:31 +0000 (19:16 +0000)]
Merge "Add code search links to warnings."
am:
adf2141b66
* commit '
adf2141b665ed2329c5f417acbaba56adb8d2240':
Add code search links to warnings.
Change-Id: I249d561788480a2cb0cb532a00cb95bd478fbe2a
Ian Rogers [Wed, 11 May 2016 19:07:36 +0000 (19:07 +0000)]
Merge "Add code search links to warnings."
Chih-Hung Hsieh [Wed, 11 May 2016 18:55:33 +0000 (11:55 -0700)]
Fix misc-macro-parentheses warnings.
Add parentheses around macro arguments used beside binary operators.
Bug:
28705665
Change-Id: I8594b9463e2389a46d6e0235757b93de065cd007