Commit Graph

5311 Commits

Author SHA1 Message Date
Ying Wang ebe63fb0a0 Store a copy of installed-files.txt in DIST_DIR if system.img failed to build
Because we already have rule to store installed-files.txt in DIST_DIR,
to avoid the slim chance of race condition, this copy is named as
installed-files-rescued.txt

Change-Id: I9fa6d8aded0ad5de1f1422d70a4224b3fc308e75
2014-08-19 12:21:35 -07:00
Dehao Chen 4e8f2ea6e8 Check existance of profile directory for specific device.
Change-Id: I149c257e98c8483b79f2afc1e5b871731f6f6519
2014-08-18 09:43:42 -07:00
Dmitriy Ivanov d8a20db0b8 Merge "Add compile time check for statically linked libc" into lmp-dev 2014-08-15 18:56:10 +00:00
Dmitriy Ivanov 655d6851f3 Add compile time check for statically linked libc
Bug: 17047392
Change-Id: I2718422e1832ec5df7f362812ae2728dfd939076
2014-08-15 14:52:42 -07:00
Narayan Kamath 50fbf71b2e Merge "Remove services, wifi, ethernet from BOOTCLASSPATH." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath f502c41459 Merge "Fix broken comparison in executable_prefer_symlink.mk" into lmp-dev 2014-08-15 04:54:19 +00:00
Dehao Chen 5b81106eb5 Merge "Explicitly check if LOCAL_FDO_SUPPORT is true (instead of empty). Change-Id: Icff260c7f866236254091b035782607a31e5a109" into lmp-dev 2014-08-15 05:03:06 +00:00
Dehao Chen f7a909db63 Explicitly check if LOCAL_FDO_SUPPORT is true (instead of empty).
Change-Id: Icff260c7f866236254091b035782607a31e5a109
2014-08-14 17:54:14 -07:00
Narayan Kamath 123854da97 Fix broken comparison in executable_prefer_symlink.mk
bug: 17024634
Change-Id: Ie9fdcbca1cbd6d204be57636864bb8074cd19732
2014-08-14 15:28:48 +01:00
Ying Wang 903e2dd014 Apply TARGET_GLOBAL_LDFLAGS to transform-bc-to-so
This fixes mips unbundled build since we switched to mips64el toolchain
for both mips and mips64.
TODO: multilib build support.

Change-Id: I7add92d2cecfc3ab739785ceef6700240a25093a
2014-08-13 18:47:50 -07:00
Bill Yi ec4c5391f1 Add atmel to vendor owner whitelist
BUG: 16463358
2014-08-13 16:53:45 -07:00
Ying Wang 45ff36ee4c Print out the tree size of system directory if it failes to build system.img
The tree size gives a good estimate of how big the system.img would be.

Change-Id: Iaadd58e3521b5f76cd9dfdcf384f4d820b9fc71b
2014-08-13 13:58:03 -07:00
Deepanshu Gupta 3412b42ada Merge "Skip extra fonts if not an extended font build." into lmp-dev 2014-08-12 23:14:35 +00:00
Deepanshu Gupta f0adf87d42 Skip extra fonts if not an extended font build.
This fixes build warning:
build/core/sdk_font.mk:51: warning: overriding commands for target
`out/host/common/obj/PACKAGING/sdk-fonts_intermediates/NanumGothic.ttf'

Change-Id: I5e208faf25f6f5d1ae3fac9970c70e80e42c7dcd
2014-08-14 19:23:01 -07:00
Ying Wang e7391fcf69 Merge "Fix HOST_LIBRARY_PATH." into lmp-dev 2014-08-12 23:14:35 +00:00
Ying Wang d481b112f2 Fix HOST_LIBRARY_PATH.
Since we switched to $(HOST_OUT)/lib64 for 64-bit libraries and
$(HOST_OUT)/lib for 32-bit libraries.

Change-Id: Ie43bc03c37e2ac8542412a7543a6af5d60c6f725
2014-08-14 11:03:56 -07:00
Justin Koh 02e5721248 am e2ff12bf: DO NOT MERGE Bump version string.
* commit 'e2ff12bf2a6892ec56676b6a845a02e81b372e8c':
  DO NOT MERGE Bump version string.
2014-08-12 23:14:33 +00:00
Justin Koh e2ff12bf2a DO NOT MERGE Bump version string.
Bump version string for KKWT MR0
Bug: 16982332

Change-Id: I8636169362ec45891257c39fb47574a6e021a3f0
2014-08-12 13:55:57 -07:00
Deepanshu Gupta d69f44efbe Merge "Add list of all fonts shipped" into lmp-dev 2014-08-12 19:21:04 +00:00
Deepanshu Gupta 88a307eb32 Add list of all fonts shipped
Create a new file that lists all the fonts bundled with the SDK.

Change-Id: I269216ee753b78e0b0ee71c0ece4f6b759c36664
2014-08-12 14:57:52 -07:00
Ying Wang 5caacc0d9a Merge "Allow to strip everything for only some build variants." into lmp-dev 2014-08-12 19:31:43 +00:00
Alex Light 95221ced39 Merge "Add a WITH_DEXOPT_BOOT_IMG_ONLY configuration option." into lmp-dev 2014-08-12 16:55:45 +00:00
Narayan Kamath 89ec496f98 Remove services, wifi, ethernet from BOOTCLASSPATH.
They belong to the system_server classpath.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
2014-08-12 10:25:19 +01:00
Deepanshu Gupta 7a864ea196 Update font list for the SDK
Java has a problem loading OpenType fonts. This change updates the list
of fonts to include by omitting the otf fonts and adding their
replacement.

This change also moves the code for configuring the fonts for the SDK in
a separate file so that the core Makefile remains cleaner.

Change-Id: Iaf30a3ec59adf251b79cb20f27ad88fc92205ac1
2014-08-11 17:59:24 -07:00
Alex Light 7326f7b746 Add a WITH_DEXOPT_BOOT_IMG_ONLY configuration option.
If WITH_DEXOPT_BOOT_IMG_ONLY=true and WITH_DEXPREOPT=true then we will
only preopt the boot.art and boot.oat files, leaving everything else to
be compiled at first boot. This has fast startup times of WITH_DEXPREOPT
but has a smaller space usage and allows one to update the non-image
parts of /system without reflashing.

Bug: 16938924

(cherry picked from commit 440cc769a3)

Change-Id: Ib366b6b5ad80f7078f01bf51f9fbc29ea7e5d777
2014-08-11 12:57:31 -07:00
Wally Yau 9042c775ec Merge "Add Mediatek and Sony to the list of vendor module owners." into lmp-dev 2014-08-11 17:09:06 +00:00
Dan Albert 016323997e Merge "Fix Windows SDK build." into lmp-dev 2014-08-11 17:09:06 +00:00
Dan Albert f6ac794dbc Merge "Inhibit implicit -Bsymolic in -shared." into lmp-dev 2014-08-11 17:09:02 +00:00
Dan Albert 8311d57e20 Merge "Fix uses of -fPIC and -fPIE." into lmp-dev 2014-08-11 17:09:06 +00:00
Ying Wang d8c5ca9e0d Allow to strip everything for only some build variants.
When LOCAL_STRIP_MODULE is keep_symbols, you can still use
STRIP_EVERYTHING_BUILD_VARIANTS in product configuration to strip
everything for some build variants, such as user build to save image
space.

Bug: 16897368
Change-Id: I2a1b7204e5c976387ddea8846c82e11a7b478d8d
2014-08-10 16:19:04 -07:00
Deepanshu Gupta ec02094d3e Merge "Use fonts from generic device for the SDK." into lmp-dev 2014-08-10 19:43:29 +00:00
Deepanshu Gupta 4e5e582522 Use fonts from generic device for the SDK.
This removes the explicit list of fonts for the SDK and replaces it with
the fonts built for the generic device.

Also, the symlinked fonts are copied becuase Windows doesn't support
symlinks.

Change-Id: I8b18b2ab0149ab24448f27dbd5f9716e5d360029
2014-08-09 00:37:31 +00:00
Dan Albert 47b755b486 Fix Windows SDK build.
Bug: 16823325
Change-Id: Ia2a318957aa525f0e72b556a693a20f513146b64
(cherry picked from commit 95994def18)
2014-08-08 08:16:04 -07:00
Dan Albert 04cf315970 Inhibit implicit -Bsymolic in -shared.
Bug: 16853291

Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
(cherry picked from commit b6bb71b85d)
2014-08-08 08:15:19 -07:00
Dan Albert 908ab54fda Fix uses of -fPIC and -fPIE.
We've been using -fPIC and -fPIE together in the global cflags all this
time. These options are incompatible. The only reason we haven't been
hit by this before is because of the forced -Bsymbolic in GCC. To fix
this, pass -fpic when compiling objects for shared libraries and -fpie
when compiling objects for executables. For static libraries, also use
-fpic. We have to do this because static libraries might be included in
either a shared library or an executable. Code compiled with -fpie
cannot be included in a shared library, but code compiled with -fpic
may be included in an executable.

We've also been using -fpic and -fPIC together. These are different
options, and only the latter will take effect.
http://stackoverflow.com/a/967010

The final thing this fixes is that we had -f(PIC|PIE) flags being passed
to link commands. These are compile time flags, and don't do anything at
link time.

Bug: 16823325
Change-Id: Ic76f47e63dc2c81b7e1a8058bae1b3dc8565d606
(cherry picked from commit 4803ce2696)
2014-08-08 08:15:14 -07:00
Wally Yau 0dcc2a645b Add Mediatek and Sony to the list of vendor module owners.
Change-Id: I72942d93303760cb5484f9a6691c36ea69f0e8e5
2014-08-08 06:54:25 -07:00
Brian Carlstrom cced082f5d Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413

(cherry picked from commit 4d30e5e260)

Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
2014-08-06 17:50:39 -07:00
Alex Light c6b7676719 Make system use patchoat to relocate during runtime.
Change DexPreOpt to include patch information of all compiled files so
we can relocate at runtime.

Bug: 15358152

(cherry picked from commit ce090d3f45)

Change-Id: I75a1eec3a38d6bce1f678c510d57849f8dfa04fa
2014-08-06 13:48:04 -07:00
Dehao Chen f15ad97a07 Merge "Change profile use path to the newly created project." into lmp-dev 2014-08-05 00:34:22 +00:00
Dehao Chen da26f200bd Change profile use path to the newly created project.
Change-Id: I3221a3b18e16d6a50cbc561c9cae1d1ab3999090
2014-08-05 15:32:41 -07:00
Colin Cross 8381b98869 Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev 2014-08-05 17:41:31 +00:00
Colin Cross ef77e517f7 Revert "HACK: report CPU abi as 2nd arch if present"
This reverts commits 8179d4dcf6,
00c67a0568, and
d00c0a2e20.

Bug: 15933961
2014-08-05 11:01:54 -07:00
Duane Sand 02f285208c [MIPSR6] Add mips64r6 and mips32r6 targets
Add mips64r6 target and corresponding mips32r6 target.
Defaults remain as mips64r2 and mips32r2.

Apply -FP64A codegen subsetting to mips32r6 only.
Access FR=0 odd-numbered 32-bit float regs only via
double-prec even-numbered regs, not by single-prec ops.

(cherry picked from commit 6bab974cdc)

Change-Id: I447337ce56c15e86cec505d68a6b45294fc3ba77
2014-08-05 12:39:28 -07:00
Duane Sand 1d04a53ba3 [MIPS64] Enable mips64 clang
(cherry picked from commit 41ca444637)

Change-Id: I0b141c58c88fe86e3a59844f53acc9a0e0a5271c
2014-08-05 12:38:31 -07:00
Duane Sand 3c4fcd8451 [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Use 4.9 mips64el toolchain for both 64- and 32-bit builds.
Tell ld when 32-bit links are required.
Override 4.9's changed defaults for mips floating point
register use, to get same assembler rules as 4.8 and earlier.

Also: drop unused  soft-fp build targets, cleanout redundant
compiler options, and remove extraneous Android.mk file.

(cherry picked from commit 6670e24aed)

Change-Id: I34d2f8fc6113c9d1670e3acff1aff48634b9fe1b
2014-08-05 12:28:44 -07:00
Doug Zongker 285dd13885 Merge "store images in target-files" into lmp-dev 2014-07-31 21:38:33 +00:00
Doug Zongker 3c84f56948 store images in target-files
Store sparse images in the target-files, and use those (when they're
available) for building block OTAs.

- New script add_img_to_target_files is added to make the images and
  add them to the IMAGES/ subdir in the target-files.  It gets run
  from the Makefile when building a target-files.

- img_from_target_files becomes mostly vestigial: it creates the
  img.zip by just copying the images out of the target-files.  (It
  still knows how to build images for use on older target-files.)

- ota_from_target_files uses images from the target-files in
  preference to rebuilding images from the source files.

- sign_apk_target_files builds images and includes them in its output
  target files (even if the input target-files didn't have them).

Bug: 16488065
Change-Id: I444e0d722d636978209467ffc01750a585c6db75
2014-07-31 11:06:30 -07:00
Ying Wang 4dfb5580c2 Merge "Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev 2014-07-30 20:38:44 +00:00
Ying Wang 934008f9d5 Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set
Bug: 16319961
Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
2014-07-30 13:40:14 -07:00
Ying Wang b169fb7822 Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
This reverts commit a4f84fdfed.
Added "export CCACHE_CPP2 := true" to work around ccache bug with clang.
See:
http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html

Change-Id: I2b1fa8fd59c3a113c4028a92a1d16018133c9792
2014-07-30 10:14:37 -07:00
Dehao Chen e43c96c332 Merge "Update the FDO support:" into lmp-dev 2014-07-29 21:36:00 +00:00
Dehao Chen 5f5c48f0f1 Update the FDO support:
* Explicitly check BUILD_FDO_INSTRUMENT and BUILD_FDO_OPTIMIZE with true
* Remove unnecessary target_libgcov
* Update the profile collection path on device so that most app can have write access

Change-Id: I5c1915a12ea37b2cb3c76a27e7104e47ad636928
2014-07-30 16:54:55 -07:00
Yohann Roussel 355520e35e Merge "Fix doc target for multidex support library." into lmp-dev 2014-07-24 15:36:05 +00:00
Yohann Roussel 85cacbe0e0 Fix doc target for multidex support library.
(cherry picked from commit 5679e356d2)

Change-Id: I2e97f59796046d94c9b03dbc89ec1d2153b54ce1
2014-07-25 17:14:35 +02:00
Stephen Hines e9bf1bdac6 Merge "Default to "prescott" as our baseline i686 host build architecture." into lmp-dev 2014-07-24 22:43:15 +00:00
Przemyslaw Szczepaniak ac6a9195ca Switch NDK arm64 libraries to 4.9.
Change-Id: Iffc30e34b798896d9259ca1dfc3ff2d21683d6a4
(cherry picked from commit 5895dd13a7)
2014-07-25 13:44:34 +00:00
Stephen Hines 76bd60b7da Default to "prescott" as our baseline i686 host build architecture.
Bug: 16408818

Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
2014-07-25 00:42:14 -07:00
Ying Wang 6aef047362 Support to set up TARGET_COPY_OUT_VENDOR in board config.
We first define TARGET_COPY_OUT_VENDOR as a placeholder. In product
config makefiiles we actually get the placeholders in
PRODUCT_COPY_FILES. A device can set up TARGET_COPY_OUT_VENDOR in its
BoardConfig.mk. We substitute the placeholder with the real
TARGET_COPY_OUT_VENDOR value after loading the BoardConfig.mk.
With this change, we can support building vendor stuff to
system.img (the default) or a separate vendor.img.

Bug: 16515152
Change-Id: I5b601d7a8b34fe032a1bac02aa5c204a3765691d
2014-07-23 22:26:32 -07:00
Dehao Chen 1cd4638594 Merge "Refactor FDO support code to ensure arm64 can also be built with FDO." into lmp-dev 2014-07-23 18:44:51 +00:00
Dehao Chen 25671e15cc Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
2014-07-23 16:23:46 -07:00
Ying Wang e799869823 Merge "Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS" into lmp-dev 2014-07-23 18:56:15 +00:00
Ying Wang 00fe587974 Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS
In prebuilt app module, you can use LOCAL_PACKAGE_SPLITS to specify a
list of prebuilt split apks. The build system will sign and zipalign the
apks and install them with the same file names.
Note that you need to put all the source split apks in the same folder.

Bug: 16319961
Change-Id: Id2b6d743c1edc5e436007ec11acece1748adad45
2014-07-23 14:38:02 -07:00
Ying Wang 0d660660db Merge "Improve rules of split apks." into lmp-dev 2014-07-23 18:56:15 +00:00
Ying Wang 7f625aad03 Improve rules of split apks.
- Better messaging if the expected split apk isn't generated by the aapt
  command in the base apk rule; Remove the built base apk, so make will
  rerun aapt after the user changes the splitting parameters.
- Use cleaner static pattern rules instead of running $(foreach) with
  $(eval).

Bug: 16319961
Change-Id: If6ae302e1a39d2e0db8f784d4e1cf292ec855281
2014-07-23 16:38:06 -07:00
Ying Wang 84c26b6949 Delete .swp file added by accident.
Also added .swp to .gitignore.

Change-Id: I51700f55230facde2e46574aa039d45ae5b29cdf
2014-07-22 17:42:35 -07:00
Ying Wang 1425e2d8c0 Support LOCAL_PACKAGE_SPLITS.
Support LOCAL_PACKAGE_SPLITS, which accepts a list of resource lables
and generates multiple apks. The build system sets up rules to sign and
zipalign the split apks.

Bug: 16319961
Change-Id: I344b3d1c7eb158c6d0df879093d666a89870aadd
2014-07-22 17:37:11 -07:00
Yohann Roussel c324a62425 Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
This keeps only the real sources in doc target and fixes some error
messages caused by trying to generate docs of the tests.

(cherry picked from commit 100aba5374)

Change-Id: I39f3ede95ae68777ca5e3db4ab5c6ebeefc86ac6
2014-07-23 16:07:20 +02:00
Daniel Rosenberg 337bbf89d9 Merge "Create a vendor build.prop for verifying versions" into lmp-dev 2014-07-22 16:21:19 +00:00
Daniel Rosenberg 40b61ca768 Create a vendor build.prop for verifying versions
The vendor build.prop contains the fingerprint for the build, and
timestamps. It allows you to tell if the vendor partition matches
the system partition.

Change-Id: Icf261571e82823928b2562e66e48fbcb0da55801
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-22 15:00:59 -07:00
Ying Wang efb935800b Support "LOCAL_SDK_VERSION := system_current"
A module can declare "LOCAL_SDK_VERSION := system_current" to build
against the android system stubs generated from source.
For now this is only supported in platform build.

Change-Id: I1e9bbd159886bc0ea3a02b1dc4cbcb1a56e9cb15
2014-07-19 17:00:50 -07:00
Ying Wang 50367cc77d Trim down BUILD_FINGERPRINT.
Bug: 15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f

Conflicts:
	core/build_id.mk
2014-07-19 09:37:52 -07:00
Ying Wang 2ce3d5c4ae Update rule of APPS_ZIP to use the new paths of apks.
Bug: 16319961
Change-Id: I9fc93f329a34e404beaf3fa212772b731a7020ff
2014-07-18 19:15:15 -07:00
Ying Wang af9757e849 New installation path for apks and their JNIs.
Apk's path is changed to <parent_dir>/MyApp/MyApp.apk;
JNI path is changed to <parent_dir>/MyApp/lib/<arch_name>/libfoo.so.
Symlinks of JNIs are changed accordingly.

Bug: 16319961
Change-Id: Ib3b2309c95fa9aea27837fcc29e28d990b04747b
2014-07-18 16:26:24 -07:00
Sebastien Hertz 3389b9e887 Merge "Vary non-image Xmx for dex2oat on MIPS." into lmp-dev 2014-07-17 19:51:18 +00:00
Ian Rogers bb6593243f Vary non-image Xmx for dex2oat on MIPS.
The image Xmx is already fixed at 64m. The issue is in the non boot image case.

(cherry picked from commit 87f0d006f2)

Change-Id: Id4a6d9e8edf00505198c3f3dd599cb7b7f06363a
2014-07-22 18:36:25 +02:00
Tsu Chiang Chuang 64a0607262 Merge "Include cts-junit target for cts tests." into lmp-dev 2014-07-22 16:29:55 +00:00
Tsu Chiang Chuang c73d200ca5 Include cts-junit target for cts tests.
(cherry picked from commit 1949a41e70)

Change-Id: Ic1d05f0eb1ceb1ac732b57ba1322acd17758b8d3
2014-07-21 22:23:18 -07:00
Ying Wang 0ea63e0cbd Merge "Remove framework2" into lmp-dev 2014-07-19 22:40:06 +00:00
Ying Wang 14c975b830 Remove framework2
We don't need fraemwork2 split with the multidex framework.jar.

Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
2014-07-21 14:42:29 -07:00
Ying Wang 2f7b92c90a The order of SDK version matters.
Because some places assumes the last item is the latest public SDK
version number.

Change-Id: I0ac83ab204dcabec0b9399db1bebc77322808074
2014-07-21 13:44:06 -07:00
Sebastien Hertz 2715dc678a Merge "Fix the MIPS build." into lmp-dev 2014-07-17 19:51:18 +00:00
Ian Rogers 16de128da1 Fix the MIPS build.
Use an override for the dex2oat Xmx value when cross-compiling.
Bug: 16221224

(cherry picked from commit 7d70f830bc)

Change-Id: Ic13b471c74325e8145a0a9c93a417355505e484a
2014-07-22 09:46:37 +02:00
Ying Wang ab4a98a85d Remove unnecessary dependency of the sdk target.
ALL_GENERATED_SOURCES forces to build heavy things already covered by
build cache.

Change-Id: I362bc450b9e303120d12ee8d53d75e86ef71e58f
2014-07-21 16:06:21 -07:00
Ying Wang 4221873693 Delete vendor and oem staging directory in "make installclean".
Change-Id: If3211772ea37d4c249c2dc5cc69bd9f48a39b6e3
2014-07-18 09:56:13 -07:00
Ying Wang 3e72ed17a5 Fail build if non-symlink /system/vendor detected while we are building
Fail build if non-symlink /system/vendor detected while we are building
a separate vendor.img.

Bug: 16360411
Change-Id: I96cb6d0b654d6632cd820ba193423e9a16214638
2014-07-17 13:00:20 -07:00
Ying Wang cff386250f Include vendor.img in PDK build.
- Add the stuff in /vendor to platform.zip.
- Pull things of vendor.img from platform.zip when doing PDK fusion
  build.

Bug: 16354024
Change-Id: I4f3fd392af8c357a5614b3e26ceac15fd3e6a0d0
2014-07-16 17:46:35 -07:00
Joe LaPenna 792ab6cd24 Add tvdpi to list of possible recovery asset densities
Bug: 16306251

Change-Id: Iaf2d36d734bb6b639b01e1097723d8387259265b
2014-07-15 16:51:44 -07:00
Ed Heyl f6771f631b reconcile aosp (8689b90bcf) after branching. Please do not merge.
Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161
2014-07-14 23:32:28 -07:00
Guang Zhu 4f892ab728 DO NOT MERGE: Change build id to LMP
Change-Id: Ic52925bb3f01c5d3f6560f6c9d7a8f4c58500101
2014-07-15 02:45:43 +00:00
Daniel Rosenberg f4eabc3961 Added support for building verified vendor partition
Change-Id: I762724800ccab3a365e6d2efdf86cd9c394818eb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-14 22:55:22 +00:00
Jeff Brown 5d0da1f959 Build docs for android-support-media-protocols.jar.
Change-Id: Ib98b1cf3c4ab04594788f5182e616987a64b55be
2014-07-14 04:08:15 -07:00
The Android Automerger 263bce3e2a "LDW13B" 2014-07-13 13:24:05 -07:00
Geremy Condra 557e9c977f Merge "Add support for signed boot images." 2014-07-10 20:49:26 +00:00
Geremy Condra 740b6636cc Add support for signed boot images. 2014-07-10 14:53:08 -07:00
Geremy Condra f5ca5c4b0d Merge "Revert "Add support for signed boot images."" 2014-07-10 20:49:26 +00:00
Geremy Condra ac880493e2 Revert "Add support for signed boot images."
This reverts commit 7e2c5ed84f.

Change-Id: Id90e3b2d986fac3ac9b2748194747af712ac4ab1
2014-07-10 21:29:24 +00:00
Geremy Condra 7e2c5ed84f Add support for signed boot images.
Change-Id: Ib08fc700f626d838efa9a543316afbcd4b782525
2014-07-10 12:23:25 -07:00
Geremy Condra 2987048f81 Merge "Add support for signed boot images." 2014-07-10 17:35:05 +00:00
Colin Cross 5c75fa6561 am 50fb938f: am ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '50fb938f79387ab92ed3b64194da47b146d74db6':
  build: fix host dex2oat runtime args
2014-07-10 09:43:33 +00:00
Colin Cross 50fb938f79 am ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit 'ec5563b55146372fe33ebd4fc13661d811b77323':
  build: fix host dex2oat runtime args
2014-07-10 06:33:08 +00:00
Colin Cross fddd992d90 am 5c75fa65: am 50fb938f: am ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '5c75fa6561b7b58ae8f024bc6936433242cc9b43':
  build: fix host dex2oat runtime args
2014-07-10 11:05:13 +00:00
Ying Wang cab3ac84c2 am 094ab99f: am bc3b9801: am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit '094ab99f27e68cfb6a39c2355be377e27bd6df72':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:42:53 +00:00
Ying Wang 094ab99f27 am bc3b9801: am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit 'bc3b98012dc77474d146db7747c7f33c50fe31c0':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:16:48 +00:00
Ying Wang bc3b98012d am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit 'c4954f392e94f1877ab77ccef725a26c5d549ed1':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:08:18 +00:00
Ying Wang edfd55ae99 Don't enable LOCAL_DEX_PREOPT for apks outside system.img
Bug: 15621103
Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f
2014-07-09 10:57:32 -07:00
Brian Carlstrom b1c9734b68 am ef0b6e0c: am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit 'ef0b6e0c19eb37f4fbc42491771611e247168519':
  Make dex2oat heap size product configurable [build]
2014-07-09 15:07:13 +00:00
Ying Wang 26dbc3e6e4 am d3b5d574: am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'd3b5d574defd565d6e810cbb86e3943837f94065':
  More consistent use of 64-bit build variable.
2014-07-09 15:07:12 +00:00
Colin Cross dd2ff5541e build: fix host dex2oat runtime args
The dalvik.vm.* properties are in PRODUCT_DEFAULT_PROPERTY_OVERRIDES,
not PRODUCT_PROPERTY_OVERRIDES.
Use $(call func,args) for user defined functions
Prepend the property contents with -Xms or -Xmx when passing to
dex2oat.  This only worked before because DEX2OAT_XMS, etc. were blank
due to the first two  bugs, which resulted in --runtime-arg --runtime-arg
and anything starting with -- as the argument to --runtime-arg is
silently ignored.

Change-Id: Ifa30038b397355171fefcc5248eea033bb634036
2014-07-09 22:22:10 -07:00
Brian Carlstrom ef0b6e0c19 am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '8a7496060df85c241b976d6cd69b13828e452ef9':
  Make dex2oat heap size product configurable [build]
2014-07-09 12:36:31 +00:00
Ying Wang d3b5d574de am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
  More consistent use of 64-bit build variable.
2014-07-09 12:36:30 +00:00
Brian Carlstrom 8a7496060d am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '02a5b51798b06434b08ffe2f6e6c485e73cd42bc':
  Make dex2oat heap size product configurable [build]
2014-07-09 12:21:56 +00:00
Ying Wang ce40d5f99e am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'bc7501e10324caf1318769901d8a382d46be0b60':
  More consistent use of 64-bit build variable.
2014-07-09 12:21:48 +00:00
Ying Wang 3abc2a3926 Copy over aidl info for modules not loaded by the current build
That way we don't lose the record if user is running mm/mmm.

Change-Id: I1e1a8b99b4f659b73f73d89f409a24aa36464066
2014-07-08 22:11:06 -07:00
Brian Carlstrom 02a5b51798 Merge "Make dex2oat heap size product configurable [build]" 2014-07-08 22:56:31 +00:00
Ying Wang 4b1c95d8d2 More consistent use of 64-bit build variable.
Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2
mechanisms to judge if it's 64-bit build;
Remove the unnecessary 32-bit host variables.

Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42
2014-07-08 18:04:17 -07:00
Dan Albert 8f73aeea87 am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '183f90f40ce9e0fafa563dfaf1fb4450cb98168c':
  Remove -Bsymbolic from builds.
2014-07-08 18:55:55 +00:00
Dan Albert 183f90f40c am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '3ffcf184bcb61bad78f3e503ca1760e64e4d30bb':
  Remove -Bsymbolic from builds.
2014-07-08 18:51:44 +00:00
Brian Carlstrom cffe289dc6 Make dex2oat heap size product configurable [build]
Bug: 15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
2014-07-08 11:33:45 -07:00
Dan Albert 3ffcf184bc Merge "Remove -Bsymbolic from builds." 2014-07-08 18:09:01 +00:00
Dan Albert 9d8d20a1e1 am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '8f73aeea87f96d715ca2f39a35fd73986feecceb':
  Remove -Bsymbolic from builds.
2014-07-08 18:59:48 +00:00
Ying Wang 55ec7e63d0 am 9e00b638: am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '9e00b6385c5805743f5beaa22dffce021342ed5e':
  Fix host java doc by referring to the correct classpath.
2014-07-08 01:38:44 +00:00
Ying Wang 9e00b6385c am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit 'cd02c025ad6b0647d612c4b939df8e5de55f5192':
  Fix host java doc by referring to the correct classpath.
2014-07-08 00:48:55 +00:00
Ying Wang cd02c025ad am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '979d578ee40c0a7d3e25915049350a23165f7a5a':
  Fix host java doc by referring to the correct classpath.
2014-07-08 00:43:42 +00:00
Ying Wang f951b7743f am 1c00c702: am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '1c00c7026c23967ca33524356dc11d9885f960f9':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:31:00 +00:00
Ying Wang 1c00c7026c am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '45322890266c1d704b130fabd7ee5bab5db35997':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:26:10 +00:00
Ying Wang 4532289026 am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit 'd2aa51b8aee454baf96d8ac6d1997dd9450ae974':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:22:13 +00:00
Ying Wang 1a5ada11d5 Auto-clean obsolete aidl-generated Java files.
The build system compares aidl files of every module to the previous
build and deletes the intermediate generated source dir if an aidl file
has gone.

Change-Id: I55fcfe1baaae3496613e12c20bca564d408bba58
2014-07-07 16:58:39 -07:00
Brian Carlstrom ba3c00765c am 3be473bd: am 97609d7f: am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"
* commit '3be473bdb5297094bb48a10b8b388e1071ed999e':
  Strip all multidex files, not just classes.dex
2014-07-02 23:13:32 +00:00
Ying Wang f50459c6e5 am 51f01f64: am bf0a9c4a: am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"
* commit '51f01f643f361d0918c181c9fc549f98f873dce9':
  Fix partition_tag usage in install_jni_libs
2014-07-02 23:13:29 +00:00
Ying Wang e68ec71903 [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.
Change-Id: I8042b045f20b870de84ea7c4c060c3cbe1cdfe69
2014-07-02 14:26:49 -07:00
Ying Wang 979d578ee4 Merge "Fix host java doc by referring to the correct classpath." 2014-07-02 20:59:15 +00:00
Ying Wang ad7809bba4 Fix host java doc by referring to the correct classpath.
In droiddoc for host, we don't generate classes.jar for
LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead.
This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in
base_rules.mk.

Bug: 9176318
Change-Id: If7460b30ca5da28743487d66da0029a44108d556
2014-07-07 16:50:39 -07:00
Ying Wang f25318a5f9 Clean the last bit of LOCAL_BUILD_HOST_DEX.
Long live LOCAL_BUILD_HOST_DEX!

Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0
2014-07-07 17:15:38 -07:00
Brian Carlstrom 3be473bdb5 am 97609d7f: am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"
* commit '97609d7f0b0a9d944e1de8b85c150d2e1772c8cb':
  Strip all multidex files, not just classes.dex
2014-07-02 16:44:19 +00:00
Brian Carlstrom 97609d7f0b am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"
* commit '7b53bca0b925bc9f47b51afba14c3c8f064eae81':
  Strip all multidex files, not just classes.dex
2014-07-02 16:39:23 +00:00
Ying Wang 51f01f643f am bf0a9c4a: am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"
* commit 'bf0a9c4ac842f340f4d995205999ed472b124f17':
  Fix partition_tag usage in install_jni_libs
2014-07-02 16:20:40 +00:00
Ying Wang bf0a9c4ac8 am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"
* commit 'cc80f5a1ff4a8b751e36b7d1d5a3670f6ec12ba0':
  Fix partition_tag usage in install_jni_libs
2014-07-02 16:15:35 +00:00
Dan Willemsen 731322a90d Fix partition_tag usage in install_jni_libs
This was expanding to TARGET_VENDOR_OUT_SHARED_LIBRARIES which was
empty. It should be expanding to TARGET_OUT_VENDOR_SHARED_LIBRARIES.

Change-Id: I32fe22e3e0b91a6d41f6a09a33d3ce2e4061d078
2014-07-01 18:56:31 -07:00
Brian Carlstrom 7b53bca0b9 Merge "Strip all multidex files, not just classes.dex" 2014-07-01 23:33:34 +00:00
Brian Carlstrom fca814550c Strip all multidex files, not just classes.dex
Bug: 10447095
Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
2014-07-01 23:04:36 -07:00
Santos Cordon 7d36e1574f Add phone directory to frameworks/base.
Necessary to support the change: Id8b08d88a06a7b4e90a4a7f702ba56526e108ca5

Change-Id: I1a00d2cdcb26fa796c5d0840cfe16b0e416ad299
2014-07-02 18:05:25 +00:00
Ying Wang e050245b7a am 0d0b7b36: am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build."
* commit '0d0b7b3669d3cb309ddd26cf23ddddbe4d42fd8e':
  More consistent host library path in multilib build.
2014-07-01 00:35:21 +00:00
Ying Wang 0d0b7b3669 am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build."
* commit '2530c787db272bfb4afab80e37323b9b7d00671c':
  More consistent host library path in multilib build.
2014-07-01 00:28:14 +00:00
Ying Wang 2530c787db am 4b539d15: Merge "More consistent host library path in multilib build."
* commit '4b539d1533a5d8647e5f54b0a41b2a49d7f4c785':
  More consistent host library path in multilib build.
2014-07-01 00:22:30 +00:00
Elliott Hughes 0635498086 am 3a2f6ecf: am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '3a2f6ecf3f7af6819b601645334d4c563401d37a':
  Add -Wl,--fatal-warnings to x86_64.
2014-06-30 23:04:35 +00:00
Elliott Hughes 3a2f6ecf3f am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '491871aa03b6a6b4d4f1d6ebb7e2f4dc746b4d4b':
  Add -Wl,--fatal-warnings to x86_64.
2014-06-30 22:59:37 +00:00
Elliott Hughes 491871aa03 am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '4b7ba41704a8f028ffdf9f2c8bff57d9d4055f93':
  Add -Wl,--fatal-warnings to x86_64.
2014-06-30 22:53:49 +00:00
Ying Wang 4b539d1533 Merge "More consistent host library path in multilib build." 2014-06-30 22:29:38 +00:00
Ying Wang 36ef50f2a2 More consistent host library path in multilib build.
In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.

Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
2014-06-30 17:06:21 -07:00
Ying Wang 9327f77a01 am ccbf5930: am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
* commit 'ccbf59304645dde557e24e7a8dd1440111d1a3ce':
  Fix missing rs_compatibility_jni_libs.
2014-06-30 18:30:46 +00:00