Commit Graph

21410 Commits

Author SHA1 Message Date
Dan Albert 071af0ac49 am b8765797: Merge "Add unwinder linking to STL setup."
* commit 'b8765797a89eebc97e38afcb94a965d69a8663ef':
  Add unwinder linking to STL setup.
2015-04-01 16:49:11 +00:00
Dan Albert 0ea16fcca3 am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
* commit '60335c03d7e897267eb20e0b0a6c7c864fd08b43':
  Revert "Revert "Fix the libgcc/libatomic link order.""
2015-04-01 16:49:10 +00:00
Dan Albert b8765797a8 Merge "Add unwinder linking to STL setup." 2015-04-01 16:40:21 +00:00
Dan Albert 60335c03d7 Merge "Revert "Revert "Fix the libgcc/libatomic link order.""" 2015-04-01 16:40:09 +00:00
Dan Albert 5036729c41 Add unwinder linking to STL setup.
Previously we were bundling this into libc++ and having each binary
resolve its symbols from there. This means that the unwinder that gets
used for a given binary is sensitive to the order in which its
libraries are linked. Making this a static library dependency of each
binary means the right unwinder will always be used.

Bug: 18471342
Bug: 19958712
Change-Id: I782d212784dbf85355b5d9146d7460d675259a0e
2015-03-31 18:29:23 -07:00
Dan Albert 91f713a168 Revert "Revert "Fix the libgcc/libatomic link order.""
This reverts commit e440c3c07b.
2015-03-31 16:42:52 -07:00
Neil Fuller 2f78e36dde am 3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code"
* commit '3cc6a0f22f285c3fd8fb7f0b6559dd24b43e6541':
  Addition of a CTS suite for tzdata update code
2015-03-31 09:25:12 +00:00
Neil Fuller 3cc6a0f22f Merge "Addition of a CTS suite for tzdata update code" 2015-03-31 08:30:51 +00:00
Ying Wang 62086971c0 am d64b853a: Merge "Bump generic_mips64 system partition size."
* commit 'd64b853a6d45d11e1f892ad02c0a653e1b5b8663':
  Bump generic_mips64 system partition size.
2015-03-31 00:13:39 +00:00
Ying Wang d64b853a6d Merge "Bump generic_mips64 system partition size." 2015-03-31 00:09:07 +00:00
Duane Sand e53cf413e1 Bump generic_mips64 system partition size.
Fix broken mips64 build via 20% increase.

Change-Id: Ie30418c6fc7cf8810139abe53537ef8259a49a2f
2015-03-30 17:02:00 -07:00
Dan Albert b6339d74fe am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
* commit 'f1a8c8c5de090221615bf1934e82e1fa9afc54b0':
  Fix up a few callers of GetTypeAndDevice.
2015-03-28 02:20:24 +00:00
Dan Albert f1a8c8c5de Merge "Fix up a few callers of GetTypeAndDevice." 2015-03-28 02:15:43 +00:00
Dan Albert ebb19aa01a Fix up a few callers of GetTypeAndDevice.
Change-Id: I8f2d8d28b60715f917e9aceb8f851ad652034aa7
2015-03-27 19:11:53 -07:00
Chih-hung Hsieh 1e9b11f4b1 am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"
* commit 'd63c78e058da1418db133f62df4ace6f8109965b':
  Allow -mcpu=cortex-a15 for clang
2015-03-27 23:17:43 +00:00
Chih-hung Hsieh d63c78e058 Merge "Allow -mcpu=cortex-a15 for clang" 2015-03-27 22:33:04 +00:00
Dan Albert 4c32aa3d0e am 99e22a57: Merge "Make releasetools pylint clean."
* commit '99e22a57d0b186cb853d757a058318a8be78918b':
  Make releasetools pylint clean.
2015-03-27 18:47:32 +00:00
Ying Wang ddc5a8f78c am 8ffec13d: Merge "Add back Java resources to apk without Java code."
* commit '8ffec13d9b3ea46a5aea1837c1184e67a908f1ef':
  Add back Java resources to apk without Java code.
2015-03-27 18:47:31 +00:00
Dan Albert 99e22a57d0 Merge "Make releasetools pylint clean." 2015-03-27 18:40:02 +00:00
Ying Wang 8ffec13d9b Merge "Add back Java resources to apk without Java code." 2015-03-27 18:32:00 +00:00
Ying Wang 454bcff255 Add back Java resources to apk without Java code.
With commit 33360dd569 we moved Java
resource packaging forward to creation of the jar file. But the Java
resource packaging will be skipped if a module has no Java code at all.
(The build system does support building an apk without Java code.)
In this change we add back the Java resources directly to the built apk
when the apk has no Java code.

(cherry-picked from commit 8b27d1879c)

Bug: 19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
2015-03-27 11:30:51 -07:00
Ying Wang 55adb5a380 am 1b23b33d: Merge "MKBOOTIMG override were missing in two places"
* commit '1b23b33d92f32626584153739308e9147d1541bd':
  MKBOOTIMG override were missing in two places
2015-03-27 16:52:49 +00:00
Ying Wang 1b23b33d92 Merge "MKBOOTIMG override were missing in two places" 2015-03-27 16:47:15 +00:00
Ying Wang bc9ade722f am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
* commit 'd5415dc778abffdf7a9abba52b093da7a20496be':
  Fix: exit code is 0 even when check-boot-jars.py fails
2015-03-26 23:30:42 +00:00
Ying Wang d5415dc778 Merge "Fix: exit code is 0 even when check-boot-jars.py fails" 2015-03-26 23:25:32 +00:00
Ying Wang abc748c11c am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
* commit '6ff1b0357289c1ef1a7aa9294aae748dacb69866':
  Support to build image of root file system with /system and ramdisk combined.
2015-03-26 17:50:10 +00:00
Ying Wang 6ff1b03572 Merge "Support to build image of root file system with /system and ramdisk combined." 2015-03-26 17:36:07 +00:00
Ying Wang a2292c94d1 Support to build image of root file system with /system and ramdisk combined.
Added support to build system.img that combines contents of /system and
the ramdisk, and can be mounted at the root of the file system.
To enable this feature, define BoardConfig.mk variable:
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

Ideally we would just change TARGET_OUT (the path of the staging system
directory) to under TARGET_ROOT_OUT. But at this point many places in
the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and
we can't make it easily configurable.
Instead this implementation takes the least intrusive approach:
We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a
temporary staging directory that contains contents of both TARGET_OUT
and TARGET_ROOT_OUT, in build_image.BuildImage() of
tools/releasetools/build_image.py.
When build_image.py is directly called from the makefile, we pass in the
parameters from the global dictionary; when build_image.BuildImage() is
called from add_img_to_target_files.py, we need to override values to
point to files extracted from the target_files zip file.
We need to combine the fs_config files of both /system and ramdisk,
when fs_config is enabled.

Also this change refactored build_image.BuildImage() by moving the extra
parameters to the image property dictionary.

(cherry-picked from commit 0eabd4f2c5)

Bug:19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
2015-03-26 10:35:00 -07:00
Neil Fuller 56128c5178 Addition of a CTS suite for tzdata update code
Bug: 19941636
Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
2015-03-26 15:18:19 +00:00
Richard Uhler 74b1105102 am e7173cee: Merge "Store odex files in oat/<isa>/ directory."
* commit 'e7173cee108fe82b0469c456f69fe5a4160d5192':
  Store odex files in oat/<isa>/ directory.
2015-03-26 15:04:43 +00:00
Richard Uhler e7173cee10 Merge "Store odex files in oat/<isa>/ directory." 2015-03-26 14:57:33 +00:00
Jiyong Park eb745aaf74 Fix: exit code is 0 even when check-boot-jars.py fails
Fix the bug that build is still success when boot jars contain
non-whitelisted classes. Now, check-boot-jars.py correctly
finishes with exit code 1 when non-whitelisted classes are found.

Change-Id: Id5c80ef9fdb70213d878d569f6033be2c9eb90d3
2015-03-26 13:25:06 +09:00
Christopher Ferris 07aa4c1fee am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
* commit 'a45223b63566d8496250ae797778a4d16ee81419':
  Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
2015-03-25 18:50:10 +00:00
Ying Wang 5a8f70678b am e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
* commit 'e9b15e2ccd07bb148b7fd7642658b9b54c0f47d0':
  Switch x86 and x86_64 to 4.9. Attempt #2.
2015-03-25 18:50:07 +00:00
Christopher Ferris a45223b635 Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2."" 2015-03-25 18:28:53 +00:00
Christopher Ferris c9d2952e1e Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
This reverts commit 6fb735b071.

Change-Id: I64b868cdfb3571de5e8b01e4257b5dfa9ee44d0d
2015-03-25 18:27:21 +00:00
Ying Wang e9b15e2ccd Merge "Switch x86 and x86_64 to 4.9. Attempt #2." 2015-03-25 18:11:54 +00:00
Bernhard Rosenkränzer a24a9a8e62 Allow -mcpu=cortex-a15 for clang
Clang 3.6 (including the snapshot present in AOSP) added support for
-mcpu=cortex-a15 -- there's no need to fall back to generic armv7-a
anymore.

Change-Id: I8a582261ac35e32f8f1def1d244cf83f2096520d
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2015-03-25 16:59:46 +01:00
Per Astrand cab6699160 MKBOOTIMG override were missing in two places
The change follows the patten found in "Package OTA" and other places
to allow for overriding the mkbootimg command.

Now pass MKBOOTIMG variable to get make_recovery_patch and add_image_to_target
to use the tool set in BOARD_CUSTOM_MKBOOTIMG for boot/recovery image
generation.

Change-Id: I78533c25e87c2750eb24ac1bf39e4b7ca321a441
2015-03-25 16:02:50 +01:00
Dan Albert 8b72aefb5a Make releasetools pylint clean.
This caught a few bugs/syntax errors (a few character classes were not
escaped properly in regex patterns, some indentation was illegal,
etc).

Change-Id: I50637607524e68c4fb9cad7167f58a46b8d26b2c
2015-03-24 11:05:16 -07:00
Dan Albert c47f47b74f am 5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
* commit '5d60719e42fdc0d007920d946f1c1bb440cedab7':
  Run ZipFile.testzip() during zipfile tests.
2015-03-24 00:12:27 +00:00
Dan Albert 5d60719e42 Merge "Run ZipFile.testzip() during zipfile tests." 2015-03-24 00:07:02 +00:00
Tao Bao 2d139fcf29 am 0488079d: Merge "Fix the computation of basefilename"
* commit '0488079dfa5d5e53198125934eeaefa9cf1e7047':
  Fix the computation of basefilename
2015-03-23 23:54:55 +00:00
Dan Albert d6d1beb88c Run ZipFile.testzip() during zipfile tests.
This still doesn't catch the issue that [1] fixes, but it's probably a
good idea anyway.

[1]: https://android-review.googlesource.com/#/c/143469/

Change-Id: Iaa607ec7450d605b26114bd81ea41a14c6613c0e
2015-03-23 16:54:39 -07:00
Tao Bao 0488079dfa Merge "Fix the computation of basefilename" 2015-03-23 23:49:00 +00:00
Tao Bao eaf885b1d0 Fix the computation of basefilename
Change-Id: I156b182414ef5b33611955cbc019e208c771013a
2015-03-23 16:05:26 -07:00
Greg Hackmann 9f201b18be am 088521ef: Merge "Allow system images larger than 2GiB, pt. 2"
* commit '088521ef906346e06ce39c877ff142c2467e3a79':
  Allow system images larger than 2GiB, pt. 2
2015-03-23 21:55:50 +00:00
Greg Hackmann 088521ef90 Merge "Allow system images larger than 2GiB, pt. 2" 2015-03-23 21:49:31 +00:00
Greg Hackmann 6701db8145 Allow system images larger than 2GiB, pt. 2
We need to patch zipfile during close() too, because it refers to the
ZIP64 file size threshold when writing out the central directory

Bug: 18015246
Bug: 19888174

Change-Id: I1b49d653d0831fcc2106808f86c929d7a2b22ff3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-23 14:35:50 -07:00
Tao Bao 62eed4d8a9 am b5901670: Merge "Fix the syntax error in the edify script generator"
* commit 'b59016703a540a541a94e352c1ef54442a0e95dd':
  Fix the syntax error in the edify script generator
2015-03-23 03:35:56 +00:00