tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19220 commits 1 branch 0 tags 119 MiB
Commit graph

19220 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tsu Chiang Chuang
a1492c7ef6 am 64a06072: Merge "Include cts-junit target for cts tests." into lmp-dev 
* commit '64a0607262c11beb4421b4902091078785dcf77d':
  Include cts-junit target for cts tests.
 2014-07-22 17:00:28 +00:00
Sebastien Hertz
0dd51404fd resolved conflicts for merge of 2715dc67 to lmp-dev-plus-aosp 
Change-Id: I48365572b92429659069b87250cae21a135cf155
 2014-07-22 18:51:05 +02:00
Ying Wang
2469e15262 am ab4a98a8: Remove unnecessary dependency of the sdk target. 
* commit 'ab4a98a85d0af425904af81c72627457292c147f':
  Remove unnecessary dependency of the sdk target.
 2014-07-22 16:36:37 +00: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
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
2d733b71e8 am 0ea63e0c: Merge "Remove framework2" into lmp-dev 
* commit '0ea63e0cbd974863f9c828951d3a9228de962db6':
  Remove framework2
 2014-07-21 22:36:34 +00:00
Ying Wang
0e4d929de0 am 2f7b92c9: The order of SDK version matters. 
* commit '2f7b92c90a5e58619fc88d5c7f4d8c36276a7b18':
  The order of SDK version matters.
 2014-07-21 20:53:00 +00: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
Ying Wang
4b4eeee01f am 04862007: Merge "Normalize SDK product name to sdk_<device_type>_<arch_name>" into lmp-dev 
* commit '0486200762a0be6080579dd60044ae3ff88f616a':
  Normalize SDK product name to sdk_<device_type>_<arch_name>
 2014-07-21 16:56:57 +00:00
Ying Wang
434a28d2d6 am f55b304f: Merge "Support "LOCAL_SDK_VERSION := system_current"" into lmp-dev 
* commit 'f55b304fd1ae10f47c97583f9faae002fde4f4ee':
  Support "LOCAL_SDK_VERSION := system_current"
 2014-07-21 16:53:18 +00:00
Baligh Uddin
305e7e2031 am cb3fe9a3: Fix LMP locales 
* commit 'cb3fe9a33680b887db316c84e7066896075a471d':
  Fix LMP locales
 2014-07-20 18:09:28 +00:00
Ying Wang
3589ab466e am 50367cc7: Trim down BUILD_FINGERPRINT. 
* commit '50367cc77db4f576f6e7421e6b302395d202482e':
  Trim down BUILD_FINGERPRINT.
 2014-07-20 18:04:09 +00:00
Ying Wang
02f6688215 am 2ce3d5c4: Update rule of APPS_ZIP to use the new paths of apks. 
* commit '2ce3d5c4ae4e5eb20d4e76931947a02bd54c3101':
  Update rule of APPS_ZIP to use the new paths of apks.
 2014-07-20 18:03:02 +00:00
Ying Wang
17739af514 am 5a5aa71f: Merge "New installation path for apks and their JNIs." into lmp-dev 
* commit '5a5aa71f6cf43355dfd8c86501eb946be499cdd0':
  New installation path for apks and their JNIs.
 2014-07-20 18:02:15 +00:00
Ed Heyl
ebf0b42f05 am 65834183: am fad4676b: (-s ours) am 6190a0c3: back port cc6be0a3: wrap make. do not merge 
* commit '65834183bf18a5c03a8d7faf73c2a36fd008c99a':
  back port cc6be0a3: wrap make. do not merge
 2014-07-20 18:01:03 +00:00
Baligh Uddin
cb3fe9a336 Fix LMP locales 
Change-Id: Iee1ac47212139ef9df541aa9f77cec42ded6a0ca
Bug: 13437459
 2014-07-20 17:25:28 +00:00
Nick Kralevich
0efe173bd8 am 1756474d: Merge "runhat: use /data/local/tmp" into lmp-dev 
* commit '1756474d873130d3340310782bc397733c80a8b6':
  runhat: use /data/local/tmp
 2014-07-20 02:18:27 +00: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
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
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
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
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
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
d12950cf2d am 42218736: Delete vendor and oem staging directory in "make installclean". 
* commit '4221873693a3383c1331176b3825bcfcc997aa5a':
  Delete vendor and oem staging directory in "make installclean".
 2014-07-18 17:02:46 +00:00
Ying Wang
4221873693 Delete vendor and oem staging directory in "make installclean". 
Change-Id: If3211772ea37d4c249c2dc5cc69bd9f48a39b6e3
 2014-07-18 09:56:13 -07:00
Yohann Roussel
6b2f483524 am d825997d: am 1029013a: Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex" 
* commit 'd825997d8765efd074279ec10ee11eda1f1bb196':
  Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
 2014-07-18 14:47:52 +00:00
Yohann Roussel
d825997d87 am 1029013a: Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex" 
* commit '1029013a0db29b926da93d2400b181d1c3b495fe':
  Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
 2014-07-18 14:43:47 +00:00
Yohann Roussel
d3101a1bbc am 60c0454d: (-s ours) am d5389ba4: Merge "Move multidex support library" 
* commit '60c0454d1dda493f9f2afa222cde8f1f89618604':
  Move multidex support library
 2014-07-18 13:02:02 +00:00
Yohann Roussel
3f97a01cbc am 368a6f44: (-s ours) am 182ac4e3: Merge "Stubs of android-support-multidex-instrumentation." 
* commit '368a6f44a9b6855ca771f18f1cec696bc75a954b':
  Stubs of android-support-multidex-instrumentation.
 2014-07-18 12:54:32 +00:00
Yohann Roussel
24c02623f2 am 189f9522: (-s ours) am 2d3e4d22: Merge "Generates SDK stubs of android-support-multidex" 
* commit '189f95221cbe673675fa9719e3c39db8e3b30bb0':
  Generates SDK stubs of android-support-multidex
 2014-07-18 12:48:07 +00:00
Yohann Roussel
33ddba19c3 am 9b457ea0: am 34ba2331: Merge "Support dx generating multiple dex files." 
* commit '9b457ea066cd5624d2ca21db20c6366077f84405':
  Support dx generating multiple dex files.
 2014-07-18 12:01:41 +00:00
Yohann Roussel
60c0454d1d am d5389ba4: Merge "Move multidex support library" 
* commit 'd5389ba4163a1a8506ab91fb287c1167a3de521f':
  Move multidex support library
 2014-07-18 10:55:07 +00:00
Yohann Roussel
368a6f44a9 am 182ac4e3: Merge "Stubs of android-support-multidex-instrumentation." 
* commit '182ac4e3fd5bf9397bf5f8397e2cc599e761e16b':
  Stubs of android-support-multidex-instrumentation.
 2014-07-18 10:55:06 +00:00
Yohann Roussel
189f95221c am 2d3e4d22: Merge "Generates SDK stubs of android-support-multidex" 
* commit '2d3e4d22d9a97837a1545a563c5d2e7e4b915040':
  Generates SDK stubs of android-support-multidex
 2014-07-18 10:55:05 +00:00
Yohann Roussel
9b457ea066 am 34ba2331: Merge "Support dx generating multiple dex files." 
* commit '34ba2331f7caec3dc5df97024fa8bf57c9e5d045':
  Support dx generating multiple dex files.
 2014-07-18 10:55:05 +00:00
Ying Wang
2282df385d am 3e72ed17: Fail build if non-symlink /system/vendor detected while we are building 
* commit '3e72ed17a557d0db6733ca6cba1f36e85f57460d':
  Fail build if non-symlink /system/vendor detected while we are building
 2014-07-17 23:47:39 +00:00
Yohann Roussel
1029013a0d Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex" 2014-07-17 22:39:21 +00:00
Yohann Roussel
182ac4e3fd Merge "Stubs of android-support-multidex-instrumentation." 2014-07-17 22:37:43 +00:00
Yohann Roussel
d5389ba416 Merge "Move multidex support library" 2014-07-17 22:36:58 +00:00
Yohann Roussel
2d3e4d22d9 Merge "Generates SDK stubs of android-support-multidex" 2014-07-17 22:36:58 +00:00
Yohann Roussel
34ba2331f7 Merge "Support dx generating multiple dex files." 2014-07-17 22:36:58 +00:00
Ying Wang
5a5aa71f6c Merge "New installation path for apks and their JNIs." into lmp-dev 2014-07-17 21:58:28 +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
Ying Wang
06940df713 resolved conflicts for merge of ef44fb2d to lmp-dev-plus-aosp 
Change-Id: I5551e6b1303f2b37d199a1b894f37c50839fdecc
 2014-07-17 14:51:13 -07:00