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
Thomas Tuttle
78c32d1c5a
libublock: Add to prelink-linux-arm.map
...
Change-Id: Ie9a4ef8650f22a5146b3a0f0dc049f46199075e9
2010-08-04 17:42:28 -07:00
Colin Cross
48642604fd
Disable CheckSize on ext partitions to fix build
...
Change-Id: I66c67f8bbd84eb9da988b4079ad4c36089c1c930
2010-08-03 22:54:30 -07:00
android-build SharedAccount
404cd14806
33b special
...
Change-Id: I025cf8d2db61752e6816a3ca726445fd869bbc57
2010-08-03 22:24:15 -07:00
Colin Cross
24f4413e0e
Merge "Pass partition size to mkuserimg.sh"
2010-08-03 18:46:06 -07: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
Ying Wang
ee81cd931c
Pass partition size to mkuserimg.sh
...
Change-Id: Id6a53d8d552e8ce1bdf83fbb756724454e05e5c8
2010-08-03 18:05:25 -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
Jeff Davidson
513d7a4021
Add tab completion for lunch.
...
Change-Id: I4ddfffe8fe4519665a5a66aa60990f900a9ba80a
2010-08-03 09:39:39 -07:00
Jing Yu
d1f76461c0
Merge "Make arm-linux-androideabi toolchain the default for Android build."
2010-08-02 20:32:42 -07:00
Hristo Bojinov
96be7205dc
Working ASLR implementation.
...
ASLR for shared libraries is controlled by "-a" in ota_from_target_files.
Binary files are self-contained (supported by apriori/soslim).
Signed-off-by: Hristo Bojinov <hristo@google.com>
Change-Id: I500e325bf4a70a8d69a2ab9b2938e83dadb4e65d
2010-08-02 14:25:01 -07:00
android-build SharedAccount
69e381b3be
FRG33
...
Change-Id: I04cafed766813daf17316651bf5403c3e4823a74
2010-08-02 14:03: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
The Android Open Source Project
d12d7367db
am 636e6dec: am 609fef71: am 3a0576a4: merge from open-source froyo
...
Merge commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc'
* commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc':
2010-07-28 11:48:46 -07:00
The Android Open Source Project
636e6dec48
am 609fef71: am 3a0576a4: merge from open-source froyo
...
Merge commit '609fef7173a1278cb79d7aefdd22a22547648cab' into gingerbread-plus-aosp
* commit '609fef7173a1278cb79d7aefdd22a22547648cab':
2010-07-28 11:47:24 -07:00
The Android Open Source Project
609fef7173
am 3a0576a4: merge from open-source froyo
...
Merge commit '3a0576a41881ceb11c3b11642666abc2f3d5a271' into gingerbread
* commit '3a0576a41881ceb11c3b11642666abc2f3d5a271':
2010-07-28 11:35:24 -07:00
The Android Open Source Project
3a0576a418
merge from open-source froyo
...
Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f
2010-07-28 11:24:38 -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
The Android Open Source Project
dbaff11c84
reconcile forked froyos
...
Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7
2010-07-28 10:41:54 -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
Chih-Wei Huang
2467fe24f0
Add atom optimization flags
...
To enable the optimization, set TARGET_ARCH_VARIANT := x86-atom.
Change-Id: I6b7798944bb8262bd83a76712419d8a77d3c34e9
2010-07-26 10:41:38 +08:00
Ying Wang
efb2168266
Dist apkcerts.txt for unbundled builds
...
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
2010-07-23 16:42:13 -07:00
Dirk Dougherty
35e642f768
Doc change: Add nexus one to dev phones image.
...
Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02
2010-07-23 14:39:41 -07:00
Evan Charlton
f2bfa76cf8
resolved conflicts for merge of 121a7873
to gingerbread
...
Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e
2010-07-23 12:21:48 -07:00
Jean-Baptiste Queru
1812dfdaf4
am 44d62854: am 8339ba91: Merge "Replaced AlarmClock with DeskClock"
...
Merge commit '44d628540c248f026bf2f26e8d9c3a17cb52b2b4'
* commit '44d628540c248f026bf2f26e8d9c3a17cb52b2b4':
Replaced AlarmClock with DeskClock
2010-07-23 11:40:09 -07:00
Jean-Baptiste Queru
44d628540c
am 8339ba91: Merge "Replaced AlarmClock with DeskClock"
...
Merge commit '8339ba912d2932a1caad24a3977ddeca0c549c48' into gingerbread-plus-aosp
* commit '8339ba912d2932a1caad24a3977ddeca0c549c48':
Replaced AlarmClock with DeskClock
2010-07-23 11:36:58 -07:00
Jean-Baptiste Queru
8339ba912d
Merge "Replaced AlarmClock with DeskClock"
2010-07-23 11:25:51 -07:00
Christian Mehlmauer
5022d63cd2
Replaced AlarmClock with DeskClock
...
Change-Id: I1a9b9ce79b5b16709fe2d89638285633801b6d24
2010-07-23 20:09:54 +02: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
android-build SharedAccount
0b991a158b
FRG22
...
Change-Id: Ie91f0556bd5e89e8b6640f0a7de1b914558bb564
2010-07-22 22:16:06 -07:00
Xavier Ducrohet
c5ba93df51
Merge "Add SystemUi to the SDK build."
2010-07-22 18:36:53 -07:00
Xavier Ducrohet
2c6d410dac
Add SystemUi to the SDK build.
...
Change-Id: I84eb98c0b3fdaeb9e06c934ea5f4bdcf078cb7f1
2010-07-22 18:31:10 -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