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

998 Commits

Author SHA1 Message Date
Raphael Moll 839c058dd0 am ddf08caa: am ddeb150d: Add easymock for list of Windows SDK targets. 
Merge commit 'ddf08caafa9644a502c0804450b9b6572010eb0d'

* commit 'ddf08caafa9644a502c0804450b9b6572010eb0d':
  Add easymock for list of Windows SDK targets.
 2010-08-17 07:51:31 -07:00
Raphael Moll ddf08caafa am ddeb150d: Add easymock for list of Windows SDK targets. 
Merge commit 'ddeb150d8d300806de576430444bf1a84ff35e96' into gingerbread-plus-aosp

* commit 'ddeb150d8d300806de576430444bf1a84ff35e96':
  Add easymock for list of Windows SDK targets.
 2010-08-17 07:48:46 -07:00
Jean-Baptiste Queru f4a956bfb6 am 4a6e7d7c: am 43d406e5: Merge "add drm/ directory to include it as part of frameworks" 
Merge commit '4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f'

* commit '4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f':
  add drm/ directory to include it as part of frameworks
 2010-08-16 15:18:51 -07:00
Raphael Moll ddeb150d8d Add easymock for list of Windows SDK targets. 
Also correctly sorted the windows sdk target list.

Change-Id: I4742a0b98ece8e0693a6f346a1f09595253d65c1
 2010-08-16 11:17:21 -07:00
Jean-Baptiste Queru 4a6e7d7c49 am 43d406e5: Merge "add drm/ directory to include it as part of frameworks" 
Merge commit '43d406e5c633af505de0e05e44fda9cfe781c184' into gingerbread-plus-aosp

* commit '43d406e5c633af505de0e05e44fda9cfe781c184':
  add drm/ directory to include it as part of frameworks
 2010-08-16 08:15:24 -07:00
Jean-Baptiste Queru 43d406e5c6 Merge "add drm/ directory to include it as part of frameworks" 2010-08-16 08:08:48 -07:00
Ben Dodson 70748bb17f Fix for heap size in apicheck 
Change-Id: Id2efffef3e81464994c3788d1d0bc69c60bc6456
 2010-08-11 14:08:28 -07:00
Ben Dodson 6629a4a08e Merge "Use doclava for apicheck" 2010-08-11 09:27:05 -07:00
Hung-ying Tyan 9904ec2429 am d81e9f88: am ddefdef5: Make ProGuard keep necessary members for serializable classes 
Merge commit 'd81e9f88f4576dd8b18143f0a0d5f50c3758202b'

* commit 'd81e9f88f4576dd8b18143f0a0d5f50c3758202b':
  Make ProGuard keep necessary members for serializable classes
 2010-08-10 17:54:32 -07:00
Hung-ying Tyan d81e9f88f4 am ddefdef5: Make ProGuard keep necessary members for serializable classes 
Merge commit 'ddefdef5bc560d95f799993759c22ddc02e61b49' into gingerbread-plus-aosp

* commit 'ddefdef5bc560d95f799993759c22ddc02e61b49':
  Make ProGuard keep necessary members for serializable classes
 2010-08-10 17:50:28 -07:00
Hung-ying Tyan ddefdef5bc Make ProGuard keep necessary members for serializable classes 
Change-Id: I845eb8280d0cab7e426b17c94d74bc409e66c193
 2010-08-11 08:24:46 +08:00
Ben Dodson 83019ba39c Use doclava for apicheck 
Change-Id: I6a84717cf645e2a27cea9271c444d159c82439c5
 2010-08-10 16:01:36 -07:00
Ben Dodson 78a24ab2a5 Merge "Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava" 2010-08-06 10:09:46 -07:00
Chung-yih Wang 2d9798cf88 resolved conflicts for merge of 9b7ebf5d to master 
Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090
 2010-08-06 10:48:53 +08:00
Chung-yih Wang 9b7ebf5dbd am 1a2649f0: Merge "Add voip(SIP related codes) into framework." into gingerbread 
Merge commit '1a2649f0da35218748db5aa02c9969246a714b8f' into gingerbread-plus-aosp

* commit '1a2649f0da35218748db5aa02c9969246a714b8f':
  Add voip(SIP related codes) into framework.
 2010-08-05 19:37:54 -07:00
Chung-yih Wang 1a2649f0da Merge "Add voip(SIP related codes) into framework." into gingerbread 2010-08-05 19:35:35 -07:00
Dima Zavin 6d98f5f4d6 core: fix paths to libm arch-specific include dirs 
Change-Id: I17a1ed13af6d4955a636ad429917b683ac59a947
Signed-off-by: Dima Zavin <dima@android.com>
 2010-08-05 17:46:53 -07:00
Ben Dodson 1034455a24 Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava 
Change-Id: If317bd108043b152d28babc88a7c949db5127a93
 2010-08-05 15:45:10 -07:00
Ying Wang ebfddaa55b Now slang supports multiple rs files in a single run. 
Change-Id: I26be766614ee3542d76471e3fc55f485ac65bdee
 2010-08-05 12:54:30 -07:00
Brian Carlstrom f9be43305a am 7dc35a3b: Tracking merge of dalvik-dev to gingerbread 
Merge commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0' into gingerbread-plus-aosp

* commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0':
  Tracking merge of dalvik-dev to gingerbread
 2010-08-05 10:40:23 -07:00
Brian Carlstrom 7dc35a3b9c Tracking merge of dalvik-dev to gingerbread 
git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd3
git cherry-pick --no-commit d05d74b2d6
git cherry-pick --no-commit 5479d77e32

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
 2010-08-04 23:17:47 -07:00
Chung-yih Wang ab8ed58c63 Add voip(SIP related codes) into framework. 
Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
 2010-08-05 11:31:07 +08:00
Colin Cross f735129d08 Merge changes I81e84ca0,I6e3a6ba3 
* changes:
  Pass partition sizes to make_ext4fs
  Add dependencies on make_ext4fs
 2010-08-03 18:45:58 -07:00
Colin Cross e0a40217df Pass partition sizes to make_ext4fs 
Change-Id: I81e84ca02e4326989d25f7d43306c56cdc39348c
 2010-08-03 14:50:41 -07:00
Colin Cross 9dd4ba88ee Add dependencies on make_ext4fs 
Change-Id: I6e3a6ba33fd9e0ce35137f6e2f60d01521af4cb9
 2010-08-03 14:50:32 -07:00
Jing Yu 9d396e37ac Make arm-linux-androideabi toolchain the default for Android build. 
androideabi target is already in upstream GCC. The arm-linux-
androideabi toolchain can be built directly from upstream GCC.
Switching from old special tailored arm-eabi toolchain to the new
arm-linux-androideabi toolchain make us closer to the opensource
community and friendly to all toolchain developers.

kernel still uses arm-eabi toolchain. So we add arm-eabi toolchain
path to PATH.

The arm-linux-androideabi-4.4.x toolchain is built with the same
source as the latest arm-eabi-4.4.3 toolchain except for the
target change patches.

Change-Id: I1e5f2fe2faeee08f913f37e0ba93e84d2654a8ff
 2010-07-29 19:09:12 -07:00
Ying Wang 778c2b6900 am 33c11ac3: am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo 
Merge commit '33c11ac3f150a388ebf2df80a42b577c136282de'

* commit '33c11ac3f150a388ebf2df80a42b577c136282de':
  Dist apkcerts.txt for unbundled builds
 2010-07-29 10:32:19 -07:00
Ying Wang 33c11ac3f1 am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo 
Merge commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4' into gingerbread-plus-aosp

* commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4':
  Dist apkcerts.txt for unbundled builds
 2010-07-29 10:30:13 -07:00
Ying Wang e1f37ba0cf am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo 
Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread

* commit '55edb20e246e88afd841f63725c647132d9aca17':
  Dist apkcerts.txt for unbundled builds
 2010-07-29 10:27:45 -07:00
Ying Wang 55edb20e24 Merge "Dist apkcerts.txt for unbundled builds" into froyo 2010-07-29 10:21:15 -07:00
Xavier Ducrohet c350a66807 am 45270759: am e743c53b: Package ddmlib-prebuilt with CTS. 
Merge commit '45270759642c03bdbe39ae261e22160d2c64ecec'

* commit '45270759642c03bdbe39ae261e22160d2c64ecec':
  Package ddmlib-prebuilt with CTS.
 2010-07-28 15:17:09 -07:00
Xavier Ducrohet 4527075964 am e743c53b: Package ddmlib-prebuilt with CTS. 
Merge commit 'e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp

* commit 'e743c53b88faf35be47667b0252c881c7b32f856':
  Package ddmlib-prebuilt with CTS.
 2010-07-28 15:14:51 -07:00
Jing Yu 8e06aa9bd6 Merge "Group needed libraries together to solve the cyclic dependence between libc, libc_nomalloc and libgcc. When building with upcoming arm-linux-androideabi toolchain, Symbol raise is needed by libgcc.a and defined by libc.a or libc_nomalloc.a.which." 2010-07-28 14:47:15 -07:00
Xavier Ducrohet e743c53b88 Package ddmlib-prebuilt with CTS. 
This ensures that CTS is using a compatible ddmlib.

Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
 2010-07-28 11:07:31 -07:00
Dianne Hackborn 79b4be961b Change version codename. 
Change-Id: I0bee8d54cf50448f53133eaae64bc0e57781d4ed
 2010-07-27 14:59:24 -07:00
aimitakeshi 2bdf2653dc add drm/ directory to include it as part of frameworks 
Change-Id: I62a6ab77587d88ea960f9ece17dcb75726e7e5a9
 2010-07-27 08:34:47 +09:00
Ying Wang f671d9ae46 Add $(LOCAL_MODULE) as part of the installed path. 
Change-Id: If691e263f157aa0d123c0e3fe3c9698bbbf58c96
 2010-07-26 16:25:55 -07:00
The Android Open Source Project 83ef704944 am 4e8e998e: am 989fade3: am af44485f: merge from open-source froyo 
Merge commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4'

* commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4':
  Include Test Case List from CTS Project
 2010-07-26 12:31:21 -07:00
The Android Open Source Project 4e8e998ecc am 989fade3: am af44485f: merge from open-source froyo 
Merge commit '989fade304ef5253b5b401f347e26f768d75f35f' into gingerbread-plus-aosp

* commit '989fade304ef5253b5b401f347e26f768d75f35f':
  Include Test Case List from CTS Project
 2010-07-26 12:25:52 -07:00
The Android Open Source Project 989fade304 am af44485f: merge from open-source froyo 
Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread

* commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10':
  Include Test Case List from CTS Project
 2010-07-26 12:06:35 -07:00
The Android Open Source Project af44485fe8 merge from open-source froyo 
Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa
 2010-07-26 12:02:01 -07:00
Evan Charlton 9b6865f826 am 606540b7: resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp 
Merge commit '606540b739599c8f079baa2a03b5f0501b148eb2'

* commit '606540b739599c8f079baa2a03b5f0501b148eb2':
  Packages can specify where to find AndroidManifest.xml
 2010-07-26 10:31:25 -07:00
Evan Charlton 606540b739 resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp 
Change-Id: I67b9af3ef344cfa7502f780d82c1a3d8a1a33f6d
 2010-07-26 08:53:19 -07:00
Ying Wang efb2168266 Dist apkcerts.txt for unbundled builds 
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
 2010-07-23 16:42:13 -07:00
Evan Charlton f2bfa76cf8 resolved conflicts for merge of 121a7873 to gingerbread 
Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e
 2010-07-23 12:21:48 -07:00
Evan Charlton 121a78733a Packages can specify where to find AndroidManifest.xml 
By overriding LOCAL_MANIFEST_FILE, a package can now specify which
AndroidManifest.xml file to use. This also allows for AndroidManifest.xml to
be in a non-standard location, though that's not recommended.

Change-Id: Ib6d1baeef7601e5a93d4ce64d18883d45373fc12
 2010-07-23 11:03:29 -07:00
Ying Wang de3bbf0e61 am 3986feae: am ef5bf469: am bce4b75f: Add JNI_H_INCLUDE as default header search path 
Merge commit '3986feae3266a86f0eb4d20fe97588868608b4c1'

* commit '3986feae3266a86f0eb4d20fe97588868608b4c1':
  Add JNI_H_INCLUDE as default header search path
 2010-07-22 17:54:45 -07:00
Ying Wang 3986feae32 am ef5bf469: am bce4b75f: Add JNI_H_INCLUDE as default header search path 
Merge commit 'ef5bf469fab7166373b10db6c88e6c3cf0e64217' into gingerbread-plus-aosp

* commit 'ef5bf469fab7166373b10db6c88e6c3cf0e64217':
  Add JNI_H_INCLUDE as default header search path
 2010-07-22 17:52:01 -07:00
Ying Wang ef5bf469fa am bce4b75f: Add JNI_H_INCLUDE as default header search path 
Merge commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441' into gingerbread

* commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441':
  Add JNI_H_INCLUDE as default header search path
 2010-07-22 17:49:13 -07:00
Ying Wang bce4b75fa7 Add JNI_H_INCLUDE as default header search path 
So that module Android.mk does not need to include it manually.
Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed.

Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b
 2010-07-22 15:58:19 -07:00