Commit Graph

26269 Commits

Author SHA1 Message Date
Gina Dimino
e1e7d93cfe Merge "Docs: Encode URL input to search box Bug: 26287939"
am: 634e4a2a39

* commit '634e4a2a39b32df838d750374ce390fa25f1710b':
  Docs: Encode URL input to search box Bug: 26287939
2016-01-06 17:41:52 +00:00
Gina Dimino
634e4a2a39 Merge "Docs: Encode URL input to search box Bug: 26287939" 2016-01-06 17:37:04 +00:00
Gina Dimino
bbde9363fa Docs: Encode URL input to search box
Bug: 26287939

Change-Id: Ica656034412b517e182333f5fe4f6e9bc5f300f3
2016-01-05 15:08:40 -08:00
Elliott Hughes
b938cbc7a7 Merge "Clean up Mac OS hacks in acp slightly."
am: 0e80edd259

* commit '0e80edd259d1ce7f35d8c9841f88296416c1e2cf':
  Clean up Mac OS hacks in acp slightly.
2016-01-05 17:48:29 +00:00
Elliott Hughes
0e80edd259 Merge "Clean up Mac OS hacks in acp slightly." 2016-01-05 17:36:09 +00:00
Elliott Hughes
636c1c4a44 Clean up Mac OS hacks in acp slightly.
Change-Id: I7cba3a345cd8907ae050961cc4f173003ac90f39
2016-01-05 09:32:42 -08:00
Narayan Kamath
491233c403 Merge "CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO"
am: b11bf3f70c

* commit 'b11bf3f70cfefd170fb4d668b9b8fabadd8959e1':
  CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO
2016-01-05 17:19:15 +00:00
Narayan Kamath
b11bf3f70c Merge "CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO" 2016-01-05 17:15:35 +00:00
Narayan Kamath
c407052766 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
2016-01-05 16:59:50 +00:00
Dan Willemsen
c4ba49dbec Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS"
am: d443abf1aa

* commit 'd443abf1aaa12c1b0fb82c940df60046c06aaed7':
  Prevent changes to COMMON_GLOBAL_C(PP)FLAGS
2016-01-05 05:52:06 +00:00
Dan Willemsen
d443abf1aa Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS" 2016-01-05 05:47:43 +00:00
Tao Bao
7da6338cf3 Merge "Build delta_generator for A/B update."
am: bf4213ebae

* commit 'bf4213ebaee1c505fa5070419aba4cd5ddccaae2':
  Build delta_generator for A/B update.
2016-01-04 19:51:30 +00:00
Tao Bao
bf4213ebae Merge "Build delta_generator for A/B update." 2016-01-04 19:46:55 +00:00
Tao Bao
f8e6fbe2f5 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
2016-01-04 09:57:32 -08:00
Christopher Wiley
5f2422beb1 Merge "Fix compiler warnings on Windows in CopyFile.c"
am: b327f61f50

* commit 'b327f61f50c5bf42dc61f5d1bc946f7e4edb7ccf':
  Fix compiler warnings on Windows in CopyFile.c
2016-01-04 17:02:44 +00:00
Christopher Wiley
b327f61f50 Merge "Fix compiler warnings on Windows in CopyFile.c" 2016-01-04 16:59:58 +00:00
Christopher Wiley
676799f23d 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
2015-12-30 12:30:58 -08:00
Christopher Wiley
9d0837cbd2 Merge "Fix unused parameter warnings in CopyFile.c"
am: 530d99446a

* commit '530d99446a02912387ea45c1d1d35a7d1bd39829':
  Fix unused parameter warnings in CopyFile.c
2015-12-30 19:09:42 +00:00
Christopher Wiley
530d99446a Merge "Fix unused parameter warnings in CopyFile.c" 2015-12-30 19:06:32 +00:00
Christopher Wiley
982e1f2650 Fix unused parameter warnings in CopyFile.c
Bug: 26355209
Test: Compiles

Change-Id: I6f804f150ec08de5a1b3272ae59bc921dd6d0c9c
2015-12-30 11:03:14 -08:00
Narayan Kamath
4baa857e6d Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits""
am: 54a5e368fe

* commit '54a5e368fea461a265374db9ecf2c0b4c6825460':
  Revert "Temporary workaround to build bouncycastle / nist-pkits"
2015-12-30 11:47:12 +00:00
Narayan Kamath
54a5e368fe Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits"" 2015-12-30 11:43:35 +00:00
Narayan Kamath
cdc3d5ac03 Revert "Temporary workaround to build bouncycastle / nist-pkits"
This reverts commit 3006881f84.
2015-12-24 12:39:51 +00:00
Narayan Kamath
45ae4eb8a2 Merge changes from topic \'aosp-merge-24-12\'
am: 8b9589216d

* commit '8b9589216dd8c2a644dab9623952b5fd8a32e550':
  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.
2015-12-24 12:04:50 +00:00
Narayan Kamath
8b9589216d 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.
2015-12-24 11:56:45 +00:00
Narayan Kamath
3006881f84 Temporary workaround to build bouncycastle / nist-pkits
Change-Id: I20bb834f08eeff03f627ab7d8f422a5ba9f3eb1a
2015-12-24 11:49:45 +00:00
Jeff Hao
5aabca204f 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 d1d3fd933f)

Change-Id: Ibd23bc06d346ff404cabd88f7461f041af6016dd
2015-12-24 10:10:55 +00:00
Narayan Kamath
76c7d68ed9 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 3026f4daf1)

Change-Id: I71b20d6f979c0f50562f4f44b2af1f3ec2909444
2015-12-24 10:10:55 +00:00
Narayan Kamath
fa257cc709 Track introduction of libopenjdkjvm.
(cherry picked from commit 2eb52037e8)

Change-Id: Ib8683d7e628ae4b09f359ecedc93f77199205cef
2015-12-24 10:10:55 +00:00
Przemyslaw Szczepaniak
20de4fa41c 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 972a2681c6)

Change-Id: I9b8516d1e7c113d667dcfb7963ee352972677afa
2015-12-24 10:10:55 +00:00
Narayan Kamath
436d0c1117 Update the package whitelist for the boot image.
.. to track the inclusion of OpenJdk.

(cherry picked from commit b3c9e4a22e)

Change-Id: Ie7277a0403dee9ccd114d9dcb7bf95cdaf5688a0
2015-12-24 10:10:55 +00:00
Piotr Jastrzebski
052a00f64e 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 89b94c827f)

Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514
2015-12-24 10:10:55 +00:00
Nick Kralevich
45407b471e Merge "set ro.adb.secure=1 for user builds"
am: f9911ae087

* commit 'f9911ae087189c26e0ef8a2334233116a8944aa7':
  set ro.adb.secure=1 for user builds
2015-12-23 20:27:00 +00:00
Nick Kralevich
f9911ae087 Merge "set ro.adb.secure=1 for user builds" 2015-12-23 20:22:30 +00:00
Daniel Micay
18a141cc8c 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
2015-12-23 20:18:15 +00:00
Tao Bao
647a1d779a Merge "Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP."
am: 9d4dbe09ed

* commit '9d4dbe09edcaeccd461138b5aefceb76759f5fd9':
  Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP.
2015-12-22 14:27:04 -08:00
Tao Bao
9d4dbe09ed Merge "Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP." 2015-12-22 22:22:44 +00:00
Dan Willemsen
5a204d1d31 Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST"
am: d52953e9ed

* commit 'd52953e9ed3a9625a61548234575acd4f0bbe87a':
  Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST
2015-12-22 14:15:47 -08:00
Dan Willemsen
d52953e9ed Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST" 2015-12-22 22:05:30 +00:00
Tao Bao
4594d0e0fd Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP.
Change-Id: I6909d4572bd54da48f7fd6b76d4a5ee03c84206c
2015-12-22 11:28:35 -08:00
Yohann Roussel
42c42b6971 Merge "Always start jack server before first call to jack"
am: 4a01711267

* commit '4a017112672901130c7ceb6c778f1ca243f2dd49':
  Always start jack server before first call to jack
2015-12-22 14:03:54 +00:00
Yohann Roussel
4a01711267 Merge "Always start jack server before first call to jack" 2015-12-22 13:59:49 +00:00
Dan Willemsen
8b9a464de4 Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST
The target BUILD_NATIVE_TEST defaults to building both 32 and 64-bit
versions of the tests. Many of our host tests have opted into this
manually, but some have not. Switch the default on the host tests to
stay consistent.

To preserve script compatibility, a symlink remains pointing to the
binary that would have been built before this change.

Change-Id: I9585984e933c2ac36134fc1968736c0bb5fea7be
2015-12-21 16:34:25 -08:00
Shinichiro Hamaji
e3d595c530 Merge "Do not use 0 in recipe"
am: 67e960b70f

* commit '67e960b70ff0c07a3ba817a687791cab538ceb66':
  Do not use $? in recipe
2015-12-21 23:07:15 +00:00
Shinichiro Hamaji
67e960b70f Merge "Do not use $? in recipe" 2015-12-21 22:46:01 +00:00
Tao Bao
c27ad030b6 Merge "Allow building recovery as boot."
am: 781b7b20d4

* commit '781b7b20d41cfe80472707aec46d0eac5473bfc5':
  Allow building recovery as boot.
2015-12-21 19:22:00 +00:00
Tao Bao
781b7b20d4 Merge "Allow building recovery as boot." 2015-12-21 19:17:56 +00:00
Daniel Rosenberg
40ef35b9e9 Allow building recovery as boot.
With BOARD_USES_RECOVERY_AS_BOOT = true, we skip building the
non-ramdisk boot.img but building the recovery image as boot.img. It
contains recovery's ramdisk (e.g. with /sbin/recovery). It depends on
the bootloader parameter (skip_initramfs) to determine the actual mode
to boot into.

Change-Id: Id6e2d0a2b94383944ca8f35bba688c6401745622
(cherry picked from commit d80bef2b9e)
2015-12-21 11:17:08 -08:00
Evgenii Stepanov
778ad5bb91 Merge "Remove RPATH for AddressSanitizer."
am: 18733b9b0c

* commit '18733b9b0c2a1c3b9b6a2808497f47be076c9561':
  Remove RPATH for AddressSanitizer.
2015-12-21 18:37:35 +00:00
Evgenii Stepanov
18733b9b0c Merge "Remove RPATH for AddressSanitizer." 2015-12-21 18:32:36 +00:00