Commit Graph

19141 Commits

Author SHA1 Message Date
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
Ying Wang a961a09e59 Fix error: 'NoneType' object is not iterable
Change-Id: I5a54edbed0e5e5481a570b93c07d50f6ca3e18e0
2014-07-29 11:42:37 -07:00
Yohann Roussel 355520e35e Merge "Fix doc target for multidex support library." into lmp-dev 2014-07-24 15:36:05 +00:00
Vignesh Venkatasubramanian 82af97fc27 Add opus entries in generic makefiles.
libopus is necessary for opus software decoding support. add that to
base.mk and add an entry for libstagefright_soft_opusdec to
core_base.mk.

Change-Id: Iddd6ab2b2a84bb966b7e635a6aa73efb6a803e98
2014-07-26 01:08:12 +00:00
Edwin Wong dbb3d2e732 Add libdrmclearkeyplugin.so to image.
The library will be added to /system/vendor/lib/mediadrm.

Change-Id: Iebfd00077c2a13e4ad4296aedba21230a7e4f37f
2014-07-25 23:25:20 +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
Svet Ganov 6693649a42 Merge "Add appwidget to system image." into lmp-dev 2014-07-22 16:21:19 +00: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
Svet Ganov acc5296cb9 Add appwidget to system image.
Change-Id: I0d5db3f39390065ec5067bb9a15924fdcb181692
2014-07-20 22:58:24 -07:00
Ying Wang 0486200762 Merge "Normalize SDK product name to sdk_<device_type>_<arch_name>" into lmp-dev 2014-07-19 22:40:06 +00:00
Ying Wang f55b304fd1 Merge "Support "LOCAL_SDK_VERSION := system_current"" into lmp-dev 2014-07-19 22:40:06 +00:00
Baligh Uddin cb3fe9a336 Fix LMP locales
Change-Id: Iee1ac47212139ef9df541aa9f77cec42ded6a0ca
Bug: 13437459
2014-07-20 17:25:28 +00: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 1f371a1f98 Normalize SDK product name to sdk_<device_type>_<arch_name>
Put the common pieces in sdk_base.mk.
Still keep the old names as aliases.
Bug: 16216170

Change-Id: I39a438843c8b09df1aafff142bd9987962f11ef8
2014-07-18 15:40:13 -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 5a5aa71f6c Merge "New installation path for apks and their JNIs." into lmp-dev 2014-07-17 21:58:28 +00:00
Ed Heyl 65834183bf am fad4676b: (-s ours) am 6190a0c3: back port cc6be0a3: wrap make. do not merge
* commit 'fad4676b67944acd14d2241ac666bbc5e69b6d54':
  back port cc6be0a3: wrap make. do not merge
2014-07-19 00:41:22 +00: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
Ed Heyl fad4676b67 am 6190a0c3: back port cc6be0a3: wrap make. do not merge
* commit '6190a0c3b33ea43639a7e748182fbac62560a09d':
  back port cc6be0a3: wrap make. do not merge
2014-07-18 18:38:24 +00:00
Ed Heyl 6190a0c3b3 back port cc6be0a3: wrap make. do not merge
Bug: 16368823 | Lunch sets $out with extra text
Change-Id: I2a1d422865a073cd30e86f1e20b4d99a3747cc0b
2014-07-18 17:58:25 +00: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
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
Nick Kralevich 1756474d87 Merge "runhat: use /data/local/tmp" into lmp-dev 2014-07-17 17:59:02 +00:00