Commit graph

8657 commits

Author SHA1 Message Date
Shinichiro Hamaji
bb1207f99c Merge "Have symbol versions in .so.toc files"
am: c610c42b99

* commit 'c610c42b99c0f9570492731911199ae75d1ad9c0':
  Have symbol versions in .so.toc files
2016-01-07 05:17:27 +00:00
Shinichiro Hamaji
c610c42b99 Merge "Have symbol versions in .so.toc files" 2016-01-07 05:14:37 +00:00
Josh Gao
5774bafd18 Merge "Kill BOARD_MALLOC_ALIGNMENT."
am: 1ad7edd5e4

* commit '1ad7edd5e46793bee4450a7d6deadc39538dbf54':
  Kill BOARD_MALLOC_ALIGNMENT.
2016-01-06 22:54:05 +00:00
Josh Gao
b1171e4a31 Kill BOARD_MALLOC_ALIGNMENT.
Bug: http://b/26403338
Change-Id: I55d2c417d972f78caddc5fb28a065807feb86b0a
2016-01-06 14:15:46 -08:00
Josh Gao
3fe35f9775 Merge "Replace MALLOC_IMPL with MALLOC_SVELTE."
am: 9fb0221abe

* commit '9fb0221abedf9c8aadbe0d5efd7797ff9b293a46':
  Replace MALLOC_IMPL with MALLOC_SVELTE.
2016-01-06 20:30:24 +00:00
Shinichiro Hamaji
2b0caa3a67 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
2016-01-06 15:13:25 +09:00
Josh Gao
a4f00d74fc Replace MALLOC_IMPL with MALLOC_SVELTE.
Bug: http://b/26390299
Change-Id: Ib1bef4aa272033412bea57a9bccf1d67793d2bda
2016-01-05 13:08:45 -08: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
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
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
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
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
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
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
Evgenii Stepanov
bbd944a25d Remove RPATH for AddressSanitizer.
RPATH was used in order for ASan executables to prefer ASan libraries
under /data. Now ASan executables use a special loader (linker_asan),
which implements this logic. RPATH is no longer needed.

Change-Id: Ic7a39b022267b80bd0ce3e95a2e822eb308a1fba
2015-12-21 10:29:54 -08:00
Shinichiro Hamaji
9cb76922aa Do not use $? in recipe
Kati cannot support this automatic variable as ninja doesn't
have a feature for this.

Change-Id: Ibc3a18dc5739b5008b156d2672a626621e046f5a
2015-12-22 00:55:37 +09:00
Yohann Roussel
0a24035cf6 Merge "Do not set Jack source version, use default"
am: 2983fd4b0f

* commit '2983fd4b0f66e58620afd57d5f68794c0767b641':
  Do not set Jack source version, use default
2015-12-21 05:01:36 -08:00
Yohann Roussel
2983fd4b0f Merge "Do not set Jack source version, use default" 2015-12-21 12:57:29 +00:00
Shinichiro Hamaji
f2f5294cb1 Merge "Disable goma/ccache with USE_XXX=false"
am: 6c90e49f4a

* commit '6c90e49f4a70e100a56e2a1b2f2550a782c72311':
  Disable goma/ccache with USE_XXX=false
2015-12-21 05:51:26 +00:00
Shinichiro Hamaji
6c90e49f4a Merge "Disable goma/ccache with USE_XXX=false" 2015-12-21 05:48:44 +00:00
Elliott Hughes
3a8929bd5a Merge "Enable -fstack-protector-strong for arm64."
am: 03b7effb8d

* commit '03b7effb8d018eb248fed9e6856a7b8795cdb907':
  Enable -fstack-protector-strong for arm64.
2015-12-18 13:45:31 -08:00
Elliott Hughes
d51fd72f73 Merge "Enable -fstack-protector-strong for arm."
am: 7fca8a373f

* commit '7fca8a373f9885d4cb23145a5b457d7f2f1c5f22':
  Enable -fstack-protector-strong for arm.
2015-12-18 13:45:23 -08:00
Elliott Hughes
03b7effb8d Merge "Enable -fstack-protector-strong for arm64." 2015-12-18 21:36:49 +00:00
Elliott Hughes
7fca8a373f Merge "Enable -fstack-protector-strong for arm." 2015-12-18 21:36:27 +00:00
Dan Willemsen
93b8a1294c Prevent changes to COMMON_GLOBAL_C(PP)FLAGS
Reorder the definitions of the core cflags so that we can prevent device
configurations from changing the global C(PP)FLAGS.

There is no reason for devices to be configuring the global cflags -- if
something needs to change for a particular device, that flag should be
defined in the BoardConfig.mk, then used in the individual makefiles
where it is needed. The common global flags also affected host tools,
which should not change between device configurations.

Bug: 26165350
Change-Id: Icece4505ce3d2a9168087d802953378534018d47
2015-12-18 12:57:57 -08:00
Yohann Roussel
09ee66e2b4 Do not set Jack source version, use default
Default source version is 1.7 in Jack B and Jack C so this means no
change to default. Not forcing it in the build rules will allow to
change it in LOCAL_JACK_FLAGS.

Bug: 26257295
Change-Id: If9b5fe250eea4bc6bcb3c16ad9cf7024d399ff3c
2015-12-18 10:30:21 +01:00
Shinichiro Hamaji
d78cba12fe Disable goma/ccache with USE_XXX=false
Bug: 26009364
Change-Id: Ic0001e6fdc62ca2373309bfe3127c5fec64d2d85
2015-12-18 15:26:17 +09:00