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

16556 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ian Rogers
2b96d6ae78 resolved conflicts for merge of 77efd7b4 to master 
Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
 2014-04-22 10:03:16 -07:00
Ian Rogers
77efd7b4cd am f1d5dcdd: am 850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator." 
* commit 'f1d5dcdd30e1f181cc1fce6d99f0f3aa589c8edd':
  Make the zygote 64-bit for the x86-64 emulator.
 2014-04-22 15:45:44 +00:00
Ian Rogers
f1d5dcdd30 am 850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator." 
* commit '850299f6a6a831d47af68a3004a62df21b5fee3a':
  Make the zygote 64-bit for the x86-64 emulator.
 2014-04-22 15:43:04 +00:00
Ian Rogers
850299f6a6 Merge "Make the zygote 64-bit for the x86-64 emulator." 2014-04-22 15:41:32 +00:00
Ying Wang
2290cbf811 Merge "Support to extract JNI libs from prebuilt APK" 2014-04-21 16:24:56 +00:00
Ying Wang
141ed58283 am fff7583f: am a59c2935: am 488b23d9: Merge "Update rules to install JNI libraries." 
* commit 'fff7583f868a7de1eeeee22f141184e86b5e664b':
  Update rules to install JNI libraries.
 2014-04-21 13:32:57 +00:00
Ying Wang
74eb6600b4 Support to extract JNI libs from prebuilt APK 
Use LOCAL_PREBUILT_JNI_LIBS to install prebuilt JNI libraries extracted
from the prebuilt apk, or prebuilts as source, to the app specific lib path.
LOCAL_PREBUILT_JNI_LIBS accepts 2 kinds of files:
- Files like @path/to/libfoo.so (path inside the apk) are JNI libs
  extracted from the prebuilt apk. In this case, all embedded JNI libs
  inside the prebuilt apk are stripped.
- Files like path/to/libfoo.so (path relative to LOCAL_PATH) are
  prebuilts in the source tree.

Those prebuilt JNI libs are not defined as modules in the build system,
so this works around possible module name conflict.

Bug: 13170859
Change-Id: I91bb844cc11b3621a85733bc7e8910f168957ef0
 2014-04-18 20:13:41 -07:00
Ian Rogers
d4186e8c1f Make the zygote 64-bit for the x86-64 emulator. 
Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
 2014-04-18 17:09:33 -07:00
Ying Wang
fff7583f86 am a59c2935: am 488b23d9: Merge "Update rules to install JNI libraries." 
* commit 'a59c2935bc63babded85aa1ce1a8b00e28dc6a11':
  Update rules to install JNI libraries.
 2014-04-19 00:05:09 +00:00
Ying Wang
a59c2935bc am 488b23d9: Merge "Update rules to install JNI libraries." 
* commit '488b23d96dc796e457d8df4d7775cefcf68320af':
  Update rules to install JNI libraries.
 2014-04-18 23:59:52 +00:00
Ying Wang
488b23d96d Merge "Update rules to install JNI libraries." 2014-04-18 23:54:43 +00:00
Ying Wang
695e826a0c Update rules to install JNI libraries. 
Previously we have to use LOCAL_REQUIRED_MODULES to install jni
libraries for an apk in bundled build.
With this change, we'll use LOCAL_JNI_SHARED_LIBRARIES alone to
install jni shared libraries.

The new rules are:
- If we are doing unbundled build, or the apk isn't going to be
  installed to system partitions, we'll embed the jni libs in the
  built apk.
- Otherwise, the jni libraries will be installed to the system
  lib path, and symlinks created in the app specific lib path.

Change-Id: Id6bd5301eb632bda3593664acee580f0d8b1d5d4
 2014-04-18 16:36:19 -07:00
Ian Rogers
621cefb88a am 29eb3d09: am 9b3fb2c3: am 67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled." 
* commit '29eb3d09c83c71e3178b027f9bcc5b4e4d75ca47':
  For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
 2014-04-18 23:21:35 +00:00
Ian Rogers
29eb3d09c8 am 9b3fb2c3: am 67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled." 
* commit '9b3fb2c32b89b3d20d6dda521ea3cd81ec75ce19':
  For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
 2014-04-18 23:18:43 +00:00
Ian Rogers
9b3fb2c32b am 67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled." 
* commit '67c209281ff0454213bc117691214bc67ad5a7f2':
  For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
 2014-04-18 23:15:17 +00:00
Ian Rogers
67c209281f Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled." 2014-04-18 23:10:31 +00:00
Ian Rogers
5d186aee8e For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled. 
Change-Id: Ia95d74517f8182031d6044ae55559010a98ec5ca
 2014-04-18 15:23:40 -07:00
Ben Cheng
1d9c67ddc5 am 1bb663a8: am 26232093: am 5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"" 
* commit '1bb663a8baf25afaab22fbe92130a302fb32814d':
  Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
 2014-04-18 21:18:37 +00:00
Ben Cheng
1bb663a8ba am 26232093: am 5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"" 
* commit '26232093bbec1a29aac18dbf2b18d9150632711d':
  Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
 2014-04-18 21:15:29 +00:00
Ben Cheng
26232093bb am 5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"" 
* commit '5c72b7266640ad8703d049910431c9ce7b91a9cd':
  Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
 2014-04-18 21:12:27 +00:00
Ben Cheng
5c72b72666 Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"" 2014-04-18 18:35:29 +00:00
Ben Cheng
e76fee59fc Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)" 
This reverts commit 084a7f8387.

GCC 4.9 still has stability issues (b/14160872)

Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271
 2014-04-18 18:34:35 +00:00
Ying Wang
c1676c9278 Merge "Update rules to install JNI libraries." 2014-04-18 18:12:20 +00:00
Ying Wang
96bcad49f4 Update rules to install JNI libraries. 
Previously we have to use LOCAL_REQUIRED_MODULES to install jni
libraries for an apk in bundled build.
With this change, we'll use LOCAL_JNI_SHARED_LIBRARIES alone to
install jni shared libraries.

The new rules are:
- If we are doing unbundled build, or the apk isn't going to be
  installed to system partitions, we'll embed the jni libs in the
  built apk.
- Otherwise, the jni libraries will be installed to the system
  lib path, and symlinks created in the app specific lib path.

Change-Id: Id6bd5301eb632bda3593664acee580f0d8b1d5d4
 2014-04-18 10:38:53 -07:00
Ben Cheng
5de2b7ffe0 am ea9552eb: am dc82c5a8: am 63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)" 
* commit 'ea9552eb2cf68c96078f2128b95490c08a9ec81b':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
 2014-04-17 19:36:49 +00:00
Ben Cheng
ea9552eb2c am dc82c5a8: am 63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)" 
* commit 'dc82c5a8c04da516057a75b212a3e9d1824628a3':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
 2014-04-17 17:08:06 +00:00
Ben Cheng
dc82c5a8c0 am 63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)" 
* commit '63030fe60842d9385f75d5ecdd17aa11a67a4e05':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
 2014-04-17 17:02:25 +00:00
Ben Cheng
63030fe608 Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)" 2014-04-17 16:54:24 +00:00
Ying Wang
a376dd8b02 Some LOCAL_DROIDDOC_HTML_DIR has "/" in it. 
Change-Id: I77ded6ef35cd91625e7988eafe7eed24fb359757
 2014-04-16 13:54:00 -07:00
Ben Cheng
084a7f8387 Use aarch64-linux-android-4.9 for arm64 build (attempt #3) 
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7

NDK libraries are still picked up from prebuilts/ndk/*/4.8/*
GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.

Change-Id: Ie0bf38357c0cf3d265d8b5dd3c2b8a8fd83b1de1
 2014-04-16 12:18:14 -07:00
Ying Wang
7cd663f0c3 Merge "Fix html_dir_files in droiddoc.mk" 2014-04-16 19:15:27 +00:00
Doug Zongker
0d8179e84b fix tapas to work in more shells 
tapas with multiple app names currently works in bash but discards all
but the first app in others (specifically, zsh).  Use shell
constructions that are more universal.

Change-Id: I2f836ddf75b89019ac04ef99647d782ffe79cfee
 2014-04-16 11:34:34 -07:00
Ying Wang
3bb5d8bca7 Fix html_dir_files in droiddoc.mk 
Previously html_dir_files includes every file in $(LOCAL_PATH), if
$(LOCAL_DROIDDOC_HTML_DIR) isn't set.

Change-Id: I3c249e5f4a0f52f71edd92862361c1dc4ab6bed7
 2014-04-16 11:28:48 -07:00
Ben Cheng
45518095f5 am 455e499b: am 6350c21e: am d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables." 
* commit '455e499b1234132fa294c1ac755e97b646a88900':
  Explicitly link libstdc++.a for static gtest executables.
 2014-04-16 17:12:23 +00:00
Ben Cheng
455e499b12 am 6350c21e: am d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables." 
* commit '6350c21eaf50435471751808ad343b0143712bae':
  Explicitly link libstdc++.a for static gtest executables.
 2014-04-16 17:09:06 +00:00
Ben Cheng
6350c21eaf am d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables." 
* commit 'd32bbe7d060ac92c062a6d57c747ffc319aa5f86':
  Explicitly link libstdc++.a for static gtest executables.
 2014-04-16 17:05:58 +00:00
Ben Cheng
d32bbe7d06 Merge "Explicitly link libstdc++.a for static gtest executables." 2014-04-16 17:03:21 +00:00
Ben Cheng
e34bb09eab Explicitly link libstdc++.a for static gtest executables. 
Change-Id: I29e3a4036264acd00dfa3229c9d0fc52ee20830e
 2014-04-16 09:42:56 -07:00
Evgeniy Stepanov
5d8029f234 Update ASan configuration. 
Change runtime library name to keep in sync with upstream.
Enable frame pointers in instrumented code for fast stack unwind.

Change-Id: I815912bb856c56c399639ea76ad4cb6b97961840
 2014-04-16 10:52:10 +00:00
Ying Wang
105ed03cf0 am 25e75aba: am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build." 
* commit '25e75abac2c9229c0c4741e33f504a341a36ad94':
  Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
 2014-04-15 23:42:38 +00:00
Andrew Hsieh
d37bf4e995 am f93c7c70: am 041d4470: am 695d8f69: Merge "Add -Wl,-maarch64linux" 
* commit 'f93c7c70247fb11dc99361c309bd6bd7b859e30e':
  Add -Wl,-maarch64linux
 2014-04-15 23:37:09 +00:00
Ying Wang
25e75abac2 am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build." 
* commit '6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65':
  Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
 2014-04-15 23:36:05 +00:00
Ying Wang
6e3bbf64b2 am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build." 
* commit '0ac89b459542ef88a8c61f45f0d6b680f9931ddf':
  Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
 2014-04-15 23:34:34 +00:00
Ying Wang
0ac89b4595 Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build." 2014-04-15 23:32:42 +00:00
Ying Wang
c73e461537 Fix variable name. 
Change-Id: Ie7439f71cf7fd2eeacd45a5d6625e610dad8bfbe
(cherry picked from commit 1a1dfcb5fcb6eda11d8dbf5df02f0083853dd5c1)
 2014-04-15 22:31:54 +00:00
Andrew Hsieh
f93c7c7024 am 041d4470: am 695d8f69: Merge "Add -Wl,-maarch64linux" 
* commit '041d44705205f7b36108bcc3a9dafe321e301221':
  Add -Wl,-maarch64linux
 2014-04-15 21:44:17 +00:00
Ying Wang
e948255ac6 Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build. 
Bug: 11368415
Bug: 14087863
Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
 2014-04-15 14:42:27 -07:00
Andrew Hsieh
041d447052 am 695d8f69: Merge "Add -Wl,-maarch64linux" 
* commit '695d8f69561b8162abe8611d1f6796b6a91ca1ac':
  Add -Wl,-maarch64linux
 2014-04-15 21:41:08 +00:00
Andrew Hsieh
695d8f6956 Merge "Add -Wl,-maarch64linux" 2014-04-15 21:39:07 +00:00
Ying Wang
51f0d3f58a resolved conflicts for merge of 70555a16 to master 
Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8
 2014-04-15 13:55:24 -07:00