openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
16,217 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

16217 Commits

Author SHA1 Message Date
Colin Cross 423242b59e am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* commit '828b518377f69516ea6cbb9ad160d81ced6980d5':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:36:15 +00:00
Colin Cross 828b518377 am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* commit 'e45c8607b3e2cf7a428a91898aea2752a54389a1':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:31:26 +00:00
Colin Cross e45c8607b3 Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* changes:
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:28:01 +00:00
Colin Cross 12d18eb563 set a prebuilt directory name for the 2nd arch 
In order to install 32-bit gdbserver on a 64-bit build,
prebuilts/misc/Android.mk needs to know the prebuilt directory name
for the 2nd arch.

Change-Id: Ibc943b758eb9404f7f5f9fbbd8720cc67f6a6f01
 2014-05-22 12:01:23 -07:00
Colin Cross 3655a68565 add vendor directories to gdb shared library search path 
Change-Id: Ib4ccf3739d6b2f14597605ce06f00e4776f67976
 2014-05-22 12:01:06 -07:00
Colin Cross 6a5fa0684a add 2nd arch gcc to the path 
Add the 2nd arch gcc to the path so users can manually run gdb,
addr2line, objdump, etc.

Change-Id: I30ff439bb6548b897d13bfa87151991d5f2948b3
 2014-05-22 12:01:06 -07:00
Colin Cross 03b424a50b fix paths when 2nd arch gcc is a different version 
arm64 is using gcc 4.9, arm is using gcc 4.8.  Fix setpaths() to
get a separate version for the 2nd arch.

Change-Id: I7bde01308fc7718360e7d0fbd46b3ae8c5f55fa7
 2014-05-22 12:01:06 -07:00
Ying Wang 716176059a am 8e2b2d8a: am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 
* commit '8e2b2d8ad4040d501d4d254cd359cf17ea32bbdd':
  Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
 2014-05-22 17:47:40 +00:00
Ying Wang 8e2b2d8ad4 am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 
* commit 'b0143e2fffbd3183175e8c1873d3466598ca9457':
  Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
 2014-05-22 17:43:14 +00:00
Ying Wang b0143e2fff Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 2014-05-22 17:38:01 +00:00
Scott Main 6433592aec am 0250f80e: am e8a3139e: am b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373 
* commit '0250f80ef0708e9ba71a77cffb29afb2356a5d25':
  Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
 2014-05-22 15:01:51 +00:00
Scott Main 0250f80ef0 am e8a3139e: am b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373 
* commit 'e8a3139ebfa103ff2b0ae1dd98abe37186ecbaad':
  Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
 2014-05-22 14:58:15 +00:00
Scott Main e8a3139ebf am b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373 
* commit 'b16376f2e600008c0d7233a919edf02a30237a9a':
  Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
 2014-05-22 14:51:08 +00:00
Scott Main b16376f2e6 Change scroll position with javascript instead of CSS. 
Makes scroll adjustment work for all types of anchors.
bug: 15129373

Change-Id: I0f934170613e8a60d94f09192e03117b8e9d4852
 2014-05-21 20:47:42 -07:00
Ying Wang 913e031793 am a72e6f80: am 8a3f514d: Merge "Split the rules to build the odex file" 
* commit 'a72e6f80e447acf225822eebdf752c0d8aa2590c':
  Split the rules to build the odex file
 2014-05-22 02:34:02 +00:00
Ying Wang a72e6f80e4 am 8a3f514d: Merge "Split the rules to build the odex file" 
* commit '8a3f514d44e2c1d4920126b3edd47f7a7616b732':
  Split the rules to build the odex file
 2014-05-22 02:29:52 +00:00
Ying Wang 8a3f514d44 Merge "Split the rules to build the odex file" 2014-05-22 02:24:59 +00:00
Dmitriy Ivanov 4ebdc93f60 am caabca37: am 5caca89c: Merge "Clarify multiarch warnings" 
* commit 'caabca3786e105abb88728b4d5c4c1436be66ba3':
  Clarify multiarch warnings
 2014-05-22 01:28:53 +00:00
Dmitriy Ivanov caabca3786 am 5caca89c: Merge "Clarify multiarch warnings" 
* commit '5caca89c5d66e9999e26905522bf2eed958d0961':
  Clarify multiarch warnings
 2014-05-22 01:24:48 +00:00
Dmitriy Ivanov 5caca89c5d Merge "Clarify multiarch warnings" 2014-05-22 01:22:00 +00:00
Dmitriy Ivanov 38bba065e0 Clarify multiarch warnings 
* Show multiarch related warnings only if my_module_multilib is both

Change-Id: If0c467c1d9b953bd3f40949ab4b97d9329ec021f
 2014-05-21 16:40:35 -07:00
Ying Wang 36142f64ae Split the rules to build the odex file 
Previously the odex file is byproduct generated by the package.apk rule.
Though we have the odex file depend on the package.apk it doesn't have
its own build recipe. In case package.apk isn't updated but we still
need to update the odex file (such as changed LOCAL_MULTILIB), the odex
file will never be rebuilt.
This change split out the rules to build the odex file and make sure the
build recipe get executed if the odex file needs rebuild.

Change-Id: I60c2f32b536b3d59045301ee863aae1451734aad
 2014-05-21 16:24:59 -07:00
Mark Salyzyn 1309152ec1 am 1fe58202: am ea65c191: Merge "libctest: zap" 
* commit '1fe582026940c70f4a7ff8f130372234d07d3611':
  libctest: zap
 2014-05-21 21:16:28 +00:00
Mark Salyzyn 1fe5820269 am ea65c191: Merge "libctest: zap" 
* commit 'ea65c191e7c08233c97c5b854537d2a0d2127733':
  libctest: zap
 2014-05-21 21:08:24 +00:00
Mark Salyzyn ea65c191e7 Merge "libctest: zap" 2014-05-21 21:02:10 +00:00
Mark Salyzyn ae0d241144 libctest: zap 
Change-Id: Ia3ff0cad0995af428adf2dbdf10587dae904ec7d
 2014-05-21 13:27:58 -07:00
Sreeram Ramachandran baf9741d55 am feb371ad: am 90a0edbc: Merge "Remove netd_client. It has moved to the internal tree." 
* commit 'feb371ad6b437aac82b46c74956bff1f83df3744':
  Remove netd_client. It has moved to the internal tree.
 2014-05-21 17:04:16 +00:00
Sreeram Ramachandran feb371ad6b am 90a0edbc: Merge "Remove netd_client. It has moved to the internal tree." 
* commit '90a0edbc0b6dfee222ff630973308c737202a6b7':
  Remove netd_client. It has moved to the internal tree.
 2014-05-21 17:01:40 +00:00
Sreeram Ramachandran 90a0edbc0b Merge "Remove netd_client. It has moved to the internal tree." 2014-05-21 16:59:25 +00:00
Sreeram Ramachandran a7877a4674 Remove netd_client. It has moved to the internal tree. 
Change-Id: Iffcdb4900373c05086fd1085b861b6520065b7a3
 2014-05-21 09:55:44 -07:00
Griff Hazen 0413efd261 resolved conflicts for merge of 3bb81eb0 to klp-modular-dev-plus-aosp 2014-05-20 20:05:08 -07:00
Justin Koh 3bb81eb04d Merge "Set API version for KKWT. DO NOT MERGE" into klp-modular-dev 2014-05-21 02:42:33 +00:00
Ying Wang 2f4c0a8617 am 8a724260: am 4e151105: Merge "Support to extract JNI libs from prebuilt APK" 
* commit '8a724260f2a3900808e0e733b893a37c119fe3f1':
  Support to extract JNI libs from prebuilt APK
 2014-05-21 01:10:15 +00:00
Ying Wang 8a724260f2 am 4e151105: Merge "Support to extract JNI libs from prebuilt APK" 
* commit '4e151105a02ba09acb277c6a084252d01c561a5f':
  Support to extract JNI libs from prebuilt APK
 2014-05-21 01:06:03 +00:00
Ying Wang 4e151105a0 Merge "Support to extract JNI libs from prebuilt APK" 2014-05-21 01:02:57 +00:00
Ying Wang 7cf9f28b5f 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-05-20 18:02:17 -07:00
Elliott Hughes d72b3164bd am e972f9ff: am 0dbcff95: Merge "The generic_arm64 system image is full." 
* commit 'e972f9ffc00c09d3071c899c68c5de31dd4d122a':
  The generic_arm64 system image is full.
 2014-05-20 23:40:01 +00:00
Christopher Ferris bcbf9ae4de am 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup." 
* commit '965f39190cb50d97b98d47ba8ca205661cfa2c3d':
  Fix extra/missing : in path setup.
 2014-05-20 23:40:00 +00:00
Elliott Hughes e972f9ffc0 am 0dbcff95: Merge "The generic_arm64 system image is full." 
* commit '0dbcff9599be1f999df467b7d17b4f2785a8452a':
  The generic_arm64 system image is full.
 2014-05-20 23:36:30 +00:00
Christopher Ferris 965f39190c am a2cd924b: Merge "Fix extra/missing : in path setup." 
* commit 'a2cd924bef556cb6ceccca1098cae338d37200a6':
  Fix extra/missing : in path setup.
 2014-05-20 23:36:28 +00:00
Elliott Hughes 0dbcff9599 Merge "The generic_arm64 system image is full." 2014-05-20 21:48:10 +00:00
Elliott Hughes 0499399231 The generic_arm64 system image is full. 
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
 2014-05-20 14:44:26 -07:00
Christopher Ferris a2cd924bef Merge "Fix extra/missing : in path setup." 2014-05-20 21:18:51 +00:00
Christopher Ferris 7110f241ab Fix extra/missing : in path setup. 
Change-Id: I4d95efc781c58af704012922d95841e009bf6286
 2014-05-20 14:09:36 -07:00
Scott Main 2949843002 am a8fcb35e: am e0968f0e: am c426499e: add 2x version of logo for sticky bar 
* commit 'a8fcb35ec1901194fe82ba3d1054c1a919e2c1d2':
  add 2x version of logo for sticky bar
 2014-05-20 17:21:55 +00:00
Scott Main a8fcb35ec1 am e0968f0e: am c426499e: add 2x version of logo for sticky bar 
* commit 'e0968f0e7027f894f3ff5a630720f12016d7202b':
  add 2x version of logo for sticky bar
 2014-05-20 17:19:22 +00:00
Scott Main e0968f0e70 am c426499e: add 2x version of logo for sticky bar 
* commit 'c426499ee8e8a3f6df85e46930a6c5aec9cf3d25':
  add 2x version of logo for sticky bar
 2014-05-20 17:16:03 +00:00
Scott Main c426499ee8 add 2x version of logo for sticky bar 
Change-Id: I5127d308ee820d4e77798ebe4aaa0f385b797383
 2014-05-20 10:11:17 -07:00
Ben Cheng dfec8f8915 am 50e99111: am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)" 
* commit '50e99111795af08c7a9c687da6680554c2b54f80':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
 2014-05-20 16:08:07 +00:00
Ben Cheng 50e9911179 am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)" 
* commit '54bea362ab7f33791bd6ea54d77a76dc8d9e005d':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
 2014-05-20 16:04:17 +00:00