OSDN Git Service
Neil Fuller [Wed, 16 Dec 2015 18:59:08 +0000 (18:59 +0000)]
Make OpenJDK 8 the default
To return to OpenJDK 7:
export LEGACY_USE_JAVA7=true
And run envsetup.sh/lunch again.
Bug:
25786468
Change-Id: I8e00591a24d13e3b8b6baaafe0fdff6536c58770
Stephen Hines [Fri, 22 Jan 2016 23:22:44 +0000 (23:22 +0000)]
Merge "Add an RS_CLANG variable as well for RenderScript."
Stephen Hines [Fri, 22 Jan 2016 23:11:34 +0000 (15:11 -0800)]
Add an RS_CLANG variable as well for RenderScript.
Change-Id: I33a73c4c2b19aa17bc18a64c92a86565111de3d0
Stephen Hines [Fri, 22 Jan 2016 21:20:19 +0000 (21:20 +0000)]
Merge "Add clang rules for RS_LLVM_* tools."
James Hawkins [Fri, 22 Jan 2016 18:09:05 +0000 (18:09 +0000)]
Merge "bootstat: Add bootstat to the embedded target to support logging boot time across devices."
Tao Bao [Fri, 22 Jan 2016 17:23:28 +0000 (17:23 +0000)]
Merge "Generate OTA packages for A/B update."
Stephen Hines [Fri, 22 Jan 2016 07:50:53 +0000 (23:50 -0800)]
Add clang rules for RS_LLVM_* tools.
This change adds new variables for RS_LLVM_* tools, which correspond
to the version of LLVM checked in currently to external/, instead of
mapping to the latest host prebuilts. This will help prevent version
differences for newer IR generated by the updated host prebuilts, which
then might not be readable with the on-device LLVM bits we build from
external/.
Change-Id: I6c7b0fa9082e9c8244cc508cb23960569a057740
Alex Klyubin [Fri, 22 Jan 2016 04:07:45 +0000 (04:07 +0000)]
Merge "Make signapk sign using APK Signature Scheme v2."
Tao Bao [Fri, 22 Jan 2016 01:28:30 +0000 (01:28 +0000)]
Merge "CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard."
Tao Bao [Fri, 22 Jan 2016 01:12:59 +0000 (17:12 -0800)]
CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
Incremental build going across CL in [1] needs to remove the old
symlink to avoid hitting mkdir error.
[1]: commit
3f56a330412b56212acc5a9ed19b747c8943b7f2
Change-Id: Iff62ed55eb2782ba3e1e9b6de39a691de2427384
James Hawkins [Thu, 21 Jan 2016 23:39:45 +0000 (15:39 -0800)]
bootstat: Add bootstat to the embedded target to support logging boot
time across devices.
Bug:
21724738
Change-Id: I165e8597103ea235a0826e321a1658823c4b4664
Colin Cross [Thu, 21 Jan 2016 23:36:26 +0000 (23:36 +0000)]
Merge "Set flag when using sdk tools in place"
Tao Bao [Thu, 21 Jan 2016 22:37:46 +0000 (22:37 +0000)]
Merge "Makefile: Fix the location for payload signing key."
Tao Bao [Thu, 21 Jan 2016 22:28:50 +0000 (14:28 -0800)]
Makefile: Fix the location for payload signing key.
CL in [1] put it in a wrong path.
[1] commit
38812d684b73b4e2bbd2a4277fd9b0d8b3c7a810
Bug:
25715402
Change-Id: I01a105888844011eee083d5f4d694223599fa067
Dan Willemsen [Thu, 21 Jan 2016 22:31:11 +0000 (22:31 +0000)]
Merge "Pass the arm/thumb cflags to assembly files"
Tao Bao [Thu, 21 Jan 2016 22:21:31 +0000 (22:21 +0000)]
Merge "Makefile: Add the payload public key into system image."
Christopher Wiley [Thu, 21 Jan 2016 18:19:05 +0000 (18:19 +0000)]
Merge "Separate aidl dependencies from compiler dependencies"
Christopher Wiley [Thu, 21 Jan 2016 18:17:29 +0000 (18:17 +0000)]
Merge "Keep aidl generated C++ inside the generated folder"
Tao Bao [Thu, 21 Jan 2016 04:58:20 +0000 (20:58 -0800)]
Makefile: Add the payload public key into system image.
For non-Brillo devices using AB update, add the payload signing public
key to the system image
(system/etc/update_engine/update-payload-key.pub.pem).
We first need to sign the payload with some private key, and pack it
into an Android OTA package. Then the whole zip package will be signed
again with the device key. This is to comply with the two existing OTA
flows (Android and CrOS).
We use the same device key to do the two signings, but update_engine
expects the key in RSA public key format. This CL extracts the public
key from x509 certificate and adds it to the system image.
Bug:
25715402
Change-Id: I6f6c1148534250ddb6d9e554175c7a35bceda99e
Colin Cross [Thu, 21 Jan 2016 00:08:49 +0000 (16:08 -0800)]
Set flag when using sdk tools in place
New version of build/ execute the tools from prebuilts/sdk/tools in
place, old versions copy them to $(HOST_OUT_EXECUTABLES). build/ and
prebuilts/sdk often use mixed versions, set a flag that
prebuilts/sdk/tools/Android.mk can use to determine when it is using an
old build/ directory.
Change-Id: Iad2f96c35203fd3b0976946d229bfa8ab4acb150
Alex Klyubin [Wed, 2 Dec 2015 02:12:09 +0000 (18:12 -0800)]
Make signapk sign using APK Signature Scheme v2.
APKs are now signed with the usual JAR signature scheme and then
with the APK Signature Scheme v2.
APK Signature Scheme v2 is a whole-file signature scheme which aims
to protect every single bit of the APK as opposed to the JAR signature
scheme which protects only the names and uncompressed contents of ZIP
entries.
The two main goals of APK Signature Scheme v2 are:
1. Detect any unauthorized modifications to the APK. This is achieved
by making the signature cover every byte of the APK being signed.
2. Enable much faster signature and integrity verification. This is
achieved by requiring only a minimal amount of APK parsing before
the signature is verified, thus completely bypassing ZIP entry
decompression and by making integrity verification parallelizable
by employing a hash tree.
Bug:
25794543
Change-Id: I275d2a6d0a98504891985309b9dfff2e0e44b878
Alex Klyubin [Wed, 20 Jan 2016 21:02:29 +0000 (21:02 +0000)]
Merge "Command-line flag to disable signing with APK Signature Scheme v2."
Alex Klyubin [Wed, 20 Jan 2016 20:51:28 +0000 (12:51 -0800)]
Command-line flag to disable signing with APK Signature Scheme v2.
This change makes signapk not reject the --disable-v2 command-line
flag which may be used by build scripts in some branches. The flag
is currently ignored.
This change is landed separately from the actual support for APK
Signature Scheme v2 because of unbundled branches which use prebuilt
versions of signapk.
Bug:
25794543
Change-Id: I900966244b8b6296b1f443bf98830cc7f7cc81a8
Christopher Wiley [Tue, 19 Jan 2016 17:26:10 +0000 (09:26 -0800)]
Separate aidl dependencies from compiler dependencies
Both aidl and clang/gcc were putting their dependencies in the same
place. Move aidl's dependencies to a file ending with .aidl.P rather
than the compiler's .P.
While here, inform kati that we have these special dep files.
Bug:
26409006
Test: Rebuild, note both files being generated
Change-Id: I29d2eea822235d60713c2059f3a314e475eb5aa3
Christopher Wiley [Tue, 19 Jan 2016 16:58:35 +0000 (08:58 -0800)]
Keep aidl generated C++ inside the generated folder
Transform ../ to dotdot/ for C++ generateds from .aidl source files.
This forces us to use one layer of indirection to calculate the build
rules for .aidl files, since we can no longer use a pattern rule.
This was tested by modifying system/tools/aidl's Android.mk to refer to
its .aidl files by going up two directories and then repeating the
directories again. When I print the build rules with $(info) I see that
dotdot/ appears in appropriate places (C++ paths, but not .aidl paths).
Bug:
26407018
Test: Described above.
Change-Id: I397c9d10408c0c66d8b5a247a1f34eb4bf4f74ce
Tao Bao [Thu, 7 Jan 2016 21:03:56 +0000 (13:03 -0800)]
Generate OTA packages for A/B update.
It calls brillo_update_payload to generate the payload for A/B update.
And packages the payload according to Android OTA package format.
Note that it only supports generating full/incremental OTAs with this
CL. Signing for release may not work properly at the moment.
Bug:
25715402
Change-Id: I4ac8505bacad28a572a9320dc8b52dd0f1ce47f5
Chih-hung Hsieh [Tue, 19 Jan 2016 23:40:56 +0000 (23:40 +0000)]
Merge "Set USE_CLANG_PLATFORM_BUILD to default true."
Tao Bao [Tue, 19 Jan 2016 22:57:25 +0000 (22:57 +0000)]
Merge "Makefile: Pack brillo_update_payload and shflags into otatools."
Tao Bao [Tue, 19 Jan 2016 22:47:17 +0000 (14:47 -0800)]
Makefile: Pack brillo_update_payload and shflags into otatools.
brillo_update_payload and shflags are the scripts to generate A/B OTA
package (payload). Include them into otatools.zip.
brillo_update_payload was already included in previous CL. Move it to
the folder for executables.
Bug:
25715402
Change-Id: Idf9c05767c24c55d058cc30e696f06d4eb5fd53b
Dan Willemsen [Sat, 16 Jan 2016 00:38:46 +0000 (16:38 -0800)]
Pass the arm/thumb cflags to assembly files
This effectively changes the default instruction set of assembly files
from arm to thumb in order to match the default for C/C++.
Change-Id: I8684f144a1195b53b3e0fdd04cacf77f6a131c7e
Chih-Hung Hsieh [Tue, 19 Jan 2016 19:43:44 +0000 (11:43 -0800)]
Set USE_CLANG_PLATFORM_BUILD to default true.
BUG:
26102335
Change-Id: I3b9fa2dfbee361410caf163147945ab448bb8ddf
Neil Fuller [Mon, 18 Jan 2016 19:36:27 +0000 (19:36 +0000)]
Merge "Remove synchronized from the public API docs"
Dan Willemsen [Sat, 16 Jan 2016 20:13:30 +0000 (20:13 +0000)]
Merge "Add -Werror=date-time to target builds"
Tianjie Xu [Fri, 15 Jan 2016 19:07:22 +0000 (19:07 +0000)]
Merge "Fix print error of numbers of blocks"
Neil Fuller [Wed, 25 Nov 2015 10:23:17 +0000 (10:23 +0000)]
Remove synchronized from the public API docs
The information is not useful. Javadoc hasn't included this
information for years.
Bug:
25767152
(cherry-picked from commit
a37bdc89b47893f740ab652fe8b58c44e440f334)
Change-Id: Id03a6e383118ab716ce870a1d7a3740656420fe7
Tianjie Xu [Thu, 14 Jan 2016 22:12:26 +0000 (14:12 -0800)]
Fix print error of numbers of blocks
The total number of blocks to pack as new data was printed incorrectly.
Fix printing.
Change-Id: I6a6bb8dd6682d9c57943ceb1a728995f9529e2fd
Tianjie Xu [Thu, 14 Jan 2016 19:17:00 +0000 (19:17 +0000)]
Merge "Adjust the size limit for splitting large files"
Tianjie Xu [Thu, 14 Jan 2016 00:14:10 +0000 (16:14 -0800)]
Adjust the size limit for splitting large files
Modify the number of max blocks per transfer to reduce splitting of
large files during patch generation. This will reduce the size of
final incremental OTA updater package. In specific, the size limit
for each file to transfer is set to 1/8 cachesize instead of a fix
number.
Bug:
26472126
Change-Id: Iffb135e378c4c7a91640f2fc4c40e9e93d1fe4bb
Dan Willemsen [Thu, 14 Jan 2016 00:40:26 +0000 (00:40 +0000)]
Merge "Allow building kati & makeparallel with soong"
Dan Willemsen [Thu, 7 Jan 2016 00:00:00 +0000 (16:00 -0800)]
Allow building kati & makeparallel with soong
This uses far fewer hacks in order to build these host tools, but will
require more libraries(libc++,etc) from unbundled and stripped down
branches.
Once this becomes the only option, all builds will happen after soong
runs. Then the toolchain / global cflags information will be able to be
moved from make to soong (and exported back to make).
Change-Id: I270b1d92bcef28a96fbc3ec9910d9bd0c101ac0f
Stephen Hines [Wed, 13 Jan 2016 20:47:13 +0000 (20:47 +0000)]
Merge "Switch to Vista instead of Win2K."
Colin Cross [Wed, 13 Jan 2016 20:32:45 +0000 (20:32 +0000)]
Merge "makeparallel: print path on exec failure"
Colin Cross [Wed, 13 Jan 2016 20:32:26 +0000 (20:32 +0000)]
Merge "Ignore Android.mk files with USE_SOONG=true"
Alex Klyubin [Wed, 13 Jan 2016 17:15:34 +0000 (17:15 +0000)]
Merge "Unconditionally use SHA-256 when minSdkVersion is 18 or higher."
Stephen Hines [Wed, 13 Jan 2016 01:56:47 +0000 (17:56 -0800)]
Switch to Vista instead of Win2K.
Bug: http://b/
26524325
Bug: http://b/
25282907
The latest Clang/LLVM requires Vista APIs in order to execute, so we
need to bump the minimum required Windows version for our host tools.
Change-Id: Ic1a760bc240060f5de39ce3a68484886021ff3d9
Dan Willemsen [Wed, 13 Jan 2016 00:56:59 +0000 (00:56 +0000)]
Merge "Remove -Wa,noexecstack from unsupported arm clang flags"
Dan Willemsen [Tue, 12 Jan 2016 23:47:58 +0000 (15:47 -0800)]
Remove -Wa,noexecstack from unsupported arm clang flags
This was marked as unsupported only on arm[64], even though it works.
For soong, we want to keep a single list of unsupported clang flags
for all architectures.
Change-Id: I9c4ae0f255c549d2346ba7abae57e22c86ddcc61
Tao Bao [Tue, 12 Jan 2016 22:18:52 +0000 (22:18 +0000)]
Merge "Fix mounting /sdcard under recovery."
Alex Klyubin [Mon, 11 Jan 2016 21:22:22 +0000 (13:22 -0800)]
Unconditionally use SHA-256 when minSdkVersion is 18 or higher.
SHA-1 is deprecated, but the replacement SHA-256 is only supported
for JAR/APK and OTA update package signatures on API Level 18 and
newer. This change thus adds a --min-sdk-version command-line
parameter to signapk. When this parameter is set to 18 or higher,
SHA-256 is used instead of SHA-1. When the parameter is not provided,
SHA-1 is used same as before.
This change also removes any other digests from the MANIFEST.MF.
This is to ignore any MANIFEST.MF digests already there in the APK,
such as when re-signing an already signed APK.
Build scripts will be modified to provide the --min-sdk-version
parameter in a follow-up change. This is not done in this change
because of prebuilts which require a prebuilt version of signapk
to support this parameter before the build scripts can be modified.
Bug:
25643280
Change-Id: I6a2782e465600fe2a3ad0c10bd80db2b80a6fb76
Alex Klyubin [Tue, 12 Jan 2016 21:22:12 +0000 (21:22 +0000)]
Merge "List SHA-1 digests of APK entries' contents in .SF files."
Alex Klyubin [Tue, 12 Jan 2016 20:23:11 +0000 (12:23 -0800)]
List SHA-1 digests of APK entries' contents in .SF files.
Due to a bug introduced in
8562fd478d7f1b1b693de5db67928f1993522c0a
SHA-1 digests of APK entries' contents were listed under wrong
attribute name. The effect is equivalent to not listing SHA-1
digests.
This change fix the issue by listing SHA-1 digests under the correct
attribute name. However, these digests are not that useful because:
(1) typically the digest of the MANIFEST.MF verifies and thus the
per-entry digests are ignored, and (2) per-entry digests of entries
with names longer than 64 characters are wrong in any case because the
digest generation code does not take into account that such names are
split over multiple lines.
An alternative to this change would be to completely omit outputting
per-entry sections of .SF files, thus saving space and speeding up APK
verification (.SF files would decompress faster).
Bug:
26513901
Change-Id: If95d58e9baa62b1113639fe70724e1e9c9f4e15c
Tom Cherry [Tue, 12 Jan 2016 20:36:32 +0000 (20:36 +0000)]
Merge "Remove special case handling of "ro." properties"
Tao Bao [Tue, 12 Jan 2016 19:34:58 +0000 (11:34 -0800)]
Fix mounting /sdcard under recovery.
The CL in [1] changed to create a symlink to /storage/self/primary for
/sdcard. It breaks the mount of /sdcard under recovery.
[1] commit
595003a3d06a13862052ef2f4f578371dae5ad65
Bug:
26509280
Change-Id: I98d02d54d707c2c8826c5ee119cf1a3ffa0c4bc9
Clay Murphy [Tue, 12 Jan 2016 19:32:26 +0000 (19:32 +0000)]
Merge "Docs: Shorten feedback button text."
Clay Murphy [Tue, 12 Jan 2016 18:55:44 +0000 (10:55 -0800)]
Docs: Shorten feedback button text.
Bug:
26452230
Change-Id: I8069d5087775a38f23e2aae86eb16fea81a65cd3
Ying Wang [Tue, 12 Jan 2016 17:35:30 +0000 (17:35 +0000)]
Merge "Generate .c for .y and .l"
Ying Wang [Tue, 12 Jan 2016 17:34:26 +0000 (17:34 +0000)]
Merge "Move "include configure_local_jack.mk""
Ying Wang [Tue, 12 Jan 2016 00:28:45 +0000 (16:28 -0800)]
Generate .c for .y and .l
- For .l/.y source files, generate .c files; for .ll/.yy source files,
generate c++ files.
- Simplified the rules by adding the generated sources to
my_generated_sources.
- Simplified generated header file naming by always using .h extension
with bison's "--defines=" option.
- Removed the unnecesarry conditional inclusion to the generated
headers. Bison already automatically generates such things.
Bug:
26492989
Change-Id: I9ab6dc149c258f7642bc36c3fa32f90ff7ee51a4
Colin Cross [Mon, 11 Jan 2016 21:01:01 +0000 (13:01 -0800)]
makeparallel: print path on exec failure
If ninja is missing makeparallel prints an unhelpful error:
out/host/linux-x86/bin/makeparallel: exec failed: No such file or directory
which suggests that makeparallel is what is missing, not what is
reporting the error. Print the path passed to exec as well.
Change-Id: Ic04c1cde6da9c3a974b5c43e3fb3bdb6da6605f7
Colin Cross [Mon, 11 Jan 2016 20:33:23 +0000 (12:33 -0800)]
Ignore Android.mk files with USE_SOONG=true
When USE_SOONG=true, ignore any Android.mk file that has an Android.bp
file in the same directory.
Change-Id: Id79bd90c2aed5dafc2f8ad2c5b7eb0aa6e81dc18
Ying Wang [Mon, 11 Jan 2016 21:34:16 +0000 (13:34 -0800)]
Move "include configure_local_jack.mk"
Move "include configure_local_jack.mk" out of the scope of
"ifdef LOCAL_RESOURCE_DIR".
Change-Id: I67bbb4e6b59414559219d24136ff91ba799fda25
Tom Cherry [Mon, 11 Jan 2016 21:16:45 +0000 (13:16 -0800)]
Remove special case handling of "ro." properties
Currently, properties that begin with "ro." are special cased to skip
over the "ro." part of the prefix before matching with entries in
property_contexts. A change to init is removing this special case and
therefore, the "ro." prefixes must be explicitly added to
property_contexts.
Bug
26425619
Change-Id: I735eb9fc208eeec284cda8d778db946eeec24192
Narayan Kamath [Mon, 11 Jan 2016 11:39:15 +0000 (11:39 +0000)]
Merge "Remove libsqlite_jni from all product configs."
Dan Willemsen [Wed, 6 Jan 2016 22:27:53 +0000 (14:27 -0800)]
Add -Werror=date-time to target builds
The lack of a changing timestamp improves reproducibility of builds, and
helps create smaller OTAs.
Bug:
24204119
Change-Id: I68acfb53be962ffd5c488337517dadb950a13b6f
Gina Dimino [Fri, 8 Jan 2016 18:31:38 +0000 (18:31 +0000)]
Merge "Docs: Changing text on Feedback button. Bug:
26452230"
Narayan Kamath [Fri, 8 Jan 2016 11:02:36 +0000 (11:02 +0000)]
Remove libsqlite_jni from all product configs.
It's only used by libcore tests so there's no need to ship it on
all products.
bug:
26457850
Change-Id: I907f781d215e94e1cbf554d81fda9e6eed07a4de
Tianjie Xu [Fri, 8 Jan 2016 00:49:49 +0000 (00:49 +0000)]
Merge "Check block0 for remounting partition R/W"
Gina Dimino [Fri, 8 Jan 2016 00:22:36 +0000 (16:22 -0800)]
Docs: Changing text on Feedback button.
Bug:
26452230
Change-Id: I716b773ed649dea4634f3db3fcb9daba0d0fab86
Shinichiro Hamaji [Thu, 7 Jan 2016 05:14:37 +0000 (05:14 +0000)]
Merge "Have symbol versions in .so.toc files"
Josh Gao [Wed, 6 Jan 2016 22:49:30 +0000 (22:49 +0000)]
Merge "Kill BOARD_MALLOC_ALIGNMENT."
Josh Gao [Wed, 6 Jan 2016 22:08:26 +0000 (14:08 -0800)]
Kill BOARD_MALLOC_ALIGNMENT.
Bug: http://b/
26403338
Change-Id: I55d2c417d972f78caddc5fb28a065807feb86b0a
Josh Gao [Wed, 6 Jan 2016 20:08:13 +0000 (20:08 +0000)]
Merge "Replace MALLOC_IMPL with MALLOC_SVELTE."
Gina Dimino [Wed, 6 Jan 2016 17:37:04 +0000 (17:37 +0000)]
Merge "Docs: Encode URL input to search box Bug:
26287939"
Shinichiro Hamaji [Wed, 6 Jan 2016 06:13:25 +0000 (15:13 +0900)]
Have symbol versions in .so.toc files
Use readelf --dyn-syms instead of nm, filtering out addresses
and sizes of symbols.
Bug:
26412928
Change-Id: I061ffb428076a79c7b255381ae4d4f8a8e7a4bd7
Gina Dimino [Tue, 5 Jan 2016 23:00:36 +0000 (15:00 -0800)]
Docs: Encode URL input to search box
Bug:
26287939
Change-Id: Ica656034412b517e182333f5fe4f6e9bc5f300f3
Josh Gao [Tue, 5 Jan 2016 20:56:35 +0000 (12:56 -0800)]
Replace MALLOC_IMPL with MALLOC_SVELTE.
Bug: http://b/
26390299
Change-Id: Ib1bef4aa272033412bea57a9bccf1d67793d2bda
Elliott Hughes [Tue, 5 Jan 2016 17:36:09 +0000 (17:36 +0000)]
Merge "Clean up Mac OS hacks in acp slightly."
Elliott Hughes [Tue, 5 Jan 2016 17:26:54 +0000 (09:26 -0800)]
Clean up Mac OS hacks in acp slightly.
Change-Id: I7cba3a345cd8907ae050961cc4f173003ac90f39
Narayan Kamath [Tue, 5 Jan 2016 17:15:35 +0000 (17:15 +0000)]
Merge "CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO"
Narayan Kamath [Tue, 5 Jan 2016 16:16:37 +0000 (16:16 +0000)]
CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO
This was never defined anywhere and only Windows doesn't have
a valid st_ino field on struct stat.
bug:
26355387
Change-Id: I40b8779606057281e2e6a2723ef93cd2f2d99a68
Dan Willemsen [Tue, 5 Jan 2016 05:47:43 +0000 (05:47 +0000)]
Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS"
Tao Bao [Mon, 4 Jan 2016 19:46:55 +0000 (19:46 +0000)]
Merge "Build delta_generator for A/B update."
Tao Bao [Mon, 4 Jan 2016 17:57:32 +0000 (09:57 -0800)]
Build delta_generator for A/B update.
delta_generator computes the OTA package (aka payload) for A/B update.
Also add its dependent libraries into otatools.zip.
Bug:
25715402
Change-Id: Iddf4b9ac188cc4c8bf3f89ce3641d68451632ba1
Christopher Wiley [Mon, 4 Jan 2016 16:59:58 +0000 (16:59 +0000)]
Merge "Fix compiler warnings on Windows in CopyFile.c"
Christopher Wiley [Wed, 30 Dec 2015 20:24:40 +0000 (12:24 -0800)]
Fix compiler warnings on Windows in CopyFile.c
direct.h declares _mkdir() on Windows.
Prevent future compiler warnings with -Wall and -Werror.
Bug:
26355209
Test: `mmma -j30 build/libs/host` for aosp_arm64-eng is successful.
Change-Id: I6d6e4edca98bef57d62829e9d1ef4e2a96cdad3d
Christopher Wiley [Wed, 30 Dec 2015 19:06:32 +0000 (19:06 +0000)]
Merge "Fix unused parameter warnings in CopyFile.c"
Christopher Wiley [Wed, 30 Dec 2015 18:43:22 +0000 (10:43 -0800)]
Fix unused parameter warnings in CopyFile.c
Bug:
26355209
Test: Compiles
Change-Id: I6f804f150ec08de5a1b3272ae59bc921dd6d0c9c
Narayan Kamath [Wed, 30 Dec 2015 11:43:35 +0000 (11:43 +0000)]
Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits""
Narayan Kamath [Thu, 24 Dec 2015 12:39:51 +0000 (12:39 +0000)]
Revert "Temporary workaround to build bouncycastle / nist-pkits"
This reverts commit
3006881f84c9abf1ab85b77ecd4e815c4cb880d0.
Narayan Kamath [Thu, 24 Dec 2015 11:56:45 +0000 (11:56 +0000)]
Merge changes from topic 'aosp-merge-24-12'
* changes:
Temporary workaround to build bouncycastle / nist-pkits
Build: Build changes for multi oat/image support.
Allow modules to override the default NOTICE file.
Track introduction of libopenjdkjvm.
Allow for 5200 words in dump-words-to-file
Update the package whitelist for the boot image.
Use core-oj alongside core-libart wherever required.
Narayan Kamath [Thu, 24 Dec 2015 11:35:24 +0000 (11:35 +0000)]
Temporary workaround to build bouncycastle / nist-pkits
Change-Id: I20bb834f08eeff03f627ab7d8f422a5ba9f3eb1a
Jeff Hao [Thu, 17 Dec 2015 01:20:11 +0000 (17:20 -0800)]
Build: Build changes for multi oat/image support.
Use the --multi-image option to generate a preopted boot image. This
generates a separate oat file and image file output for each dex file
input.
Stop inlining core.
(cherry picked from commit
d1d3fd933f3d79dfffc12c68a21ae1a1e1b21cc0)
Change-Id: Ibd23bc06d346ff404cabd88f7461f041af6016dd
Narayan Kamath [Tue, 22 Dec 2015 14:34:09 +0000 (14:34 +0000)]
Allow modules to override the default NOTICE file.
It's useful in projects where different top level modules have
different licenses associated with them.
(cherry picked from commit
3026f4daf11b2d4729559d49624e748a82f15495)
Change-Id: I71b20d6f979c0f50562f4f44b2af1f3ec2909444
Narayan Kamath [Fri, 18 Dec 2015 11:10:53 +0000 (11:10 +0000)]
Track introduction of libopenjdkjvm.
(cherry picked from commit
2eb52037e8c06473d0d8de7fb68acc5beccdc6ba)
Change-Id: Ib8683d7e628ae4b09f359ecedc93f77199205cef
Przemyslaw Szczepaniak [Fri, 20 Nov 2015 15:05:03 +0000 (15:05 +0000)]
Allow for 5200 words in dump-words-to-file
After switching to OpenJdk, doc-comment-check target
started to fail due to "Too many words (5082)" while
generating out/target/common/docs/doc-comment-check-timestamp.rsp
This change extends number of dumped words to 5200.
Bug:
25758743
(cherry picked from commit
972a2681c6cb1992886195b9e69234ef786cb876)
Change-Id: I9b8516d1e7c113d667dcfb7963ee352972677afa
Narayan Kamath [Tue, 17 Nov 2015 18:34:53 +0000 (18:34 +0000)]
Update the package whitelist for the boot image.
.. to track the inclusion of OpenJdk.
(cherry picked from commit
b3c9e4a22ee6d32a99a5c9a7b833e2644a690c82)
Change-Id: Ie7277a0403dee9ccd114d9dcb7bf95cdaf5688a0
Piotr Jastrzebski [Tue, 17 Feb 2015 16:55:52 +0000 (16:55 +0000)]
Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.
(cherry picked from commit
89b94c827f92e107b286ab60876ff9f75ba22a33)
Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514
Nick Kralevich [Wed, 23 Dec 2015 20:22:30 +0000 (20:22 +0000)]
Merge "set ro.adb.secure=1 for user builds"
Daniel Micay [Wed, 16 Dec 2015 21:42:49 +0000 (16:42 -0500)]
set ro.adb.secure=1 for user builds
In user builds, adb without authentication is always disabled. However,
it doesn't work with the defaults because authentication doesn't work
without having ro.adb.secure=1 set. It makes sense to offer builds with
no adb but not builds with adb present in an unusable state (especially
as the default).
Bug:
22220212
Bug:
21862859
Change-Id: Ic22300a70586fd57692ac59d6873ab16dde70919
Tao Bao [Tue, 22 Dec 2015 22:22:44 +0000 (22:22 +0000)]
Merge "Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP."