OSDN Git Service
Ying Wang [Tue, 9 Jun 2015 00:01:03 +0000 (00:01 +0000)]
am
18e98163: am
8e42131b: Merge "Strip path from verity_signer_cmd in the target-files meta data."
* commit '
18e981638d77af502a42895fbb37bc80e3642283':
Strip path from verity_signer_cmd in the target-files meta data.
Ying Wang [Mon, 8 Jun 2015 23:48:24 +0000 (23:48 +0000)]
am
8e42131b: Merge "Strip path from verity_signer_cmd in the target-files meta data."
* commit '
8e42131ba2aa4fd12395e2c122ab62c9991e6f72':
Strip path from verity_signer_cmd in the target-files meta data.
Ying Wang [Mon, 8 Jun 2015 23:39:24 +0000 (23:39 +0000)]
Merge "Strip path from verity_signer_cmd in the target-files meta data."
Ying Wang [Mon, 8 Jun 2015 20:08:09 +0000 (20:08 +0000)]
am
ac3f88d8: am
080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit '
ac3f88d8a2812cd2134f9b67ec4a928d886a4eb6':
Remove the unnecessary full_x86_64 and full_mips64.
Ying Wang [Mon, 8 Jun 2015 19:15:13 +0000 (19:15 +0000)]
am
080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit '
080f57aed7ac0f03c5db216dafe5023b032525ed':
Remove the unnecessary full_x86_64 and full_mips64.
Ying Wang [Mon, 8 Jun 2015 19:00:59 +0000 (19:00 +0000)]
Merge "Remove the unnecessary full_x86_64 and full_mips64."
Ying Wang [Mon, 8 Jun 2015 18:57:26 +0000 (11:57 -0700)]
Remove the unnecessary full_x86_64 and full_mips64.
For historical reason, the aosp_* products were named full_*.
We keep the full, full_x86 and full_mips in case some tools still
reference these legacy names; But no reason the have the full_* product
names for the new 64-bit archs.
Change-Id: I240ed0c6ded0ded2d80603bd0c5ff24750999afc
Luan Nguyen [Fri, 5 Jun 2015 02:50:18 +0000 (02:50 +0000)]
am
18985e76: am
30b16ac6: am
95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '
18985e76617fefab2d9bf480c99994e1e9ba9143':
docs: Add styles for embedded videos to match DevSite
Luan Nguyen [Fri, 5 Jun 2015 02:27:29 +0000 (02:27 +0000)]
am
30b16ac6: am
95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '
30b16ac6a4d4658d927d48476081de7542b5989f':
docs: Add styles for embedded videos to match DevSite
Dimitry Ivanov [Thu, 4 Jun 2015 20:19:49 +0000 (20:19 +0000)]
am
72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev
* commit '
72bced8a758a3a8427768d97e6d763f6a706d2b1':
Uncompress .so files before signing the apk.
Don't extract jni from prebuilt apks.
Dimitry Ivanov [Thu, 4 Jun 2015 18:32:06 +0000 (18:32 +0000)]
Merge changes from topic 'prebuilt-open-from-apk' into mnc-dev
* changes:
Uncompress .so files before signing the apk.
Don't extract jni from prebuilt apks.
Narayan Kamath [Thu, 4 Jun 2015 11:14:40 +0000 (11:14 +0000)]
am
cf7fbcd0: Remove duplicate CTS tests from libcore cts packages.
* commit '
cf7fbcd03d9f13d1c2fe6e65f02247feadec136d':
Remove duplicate CTS tests from libcore cts packages.
Narayan Kamath [Mon, 1 Jun 2015 13:45:55 +0000 (14:45 +0100)]
Remove duplicate CTS tests from libcore cts packages.
The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages. Replace the catch-all org.* with specific prefixes.
Needs additional support in CollectAllTests to handle multiple
prefixes. This is implemented in the companion change.
bug:
20862863
Change-Id: I44348052d20312d478bdbf6df0e561db63e18cd8
Tao Bao [Thu, 4 Jun 2015 01:34:06 +0000 (01:34 +0000)]
am
726b7f33: Fix the broken signing script
* commit '
726b7f338f32ca6d18e9961b0a2da3ef385f7e34':
Fix the broken signing script
Tao Bao [Thu, 4 Jun 2015 00:31:34 +0000 (17:31 -0700)]
Fix the broken signing script
check_target_files_signatures.py was accidentally broken due to the
renaming of a variable in last commit. It escaped the checking from
pylint because it was a keyword ('all').
Bug:
21611858
Change-Id: I58c983e59c4a3e0018481d3c9ba328ed76f5c08a
Yorke Lee [Wed, 3 Jun 2015 21:59:47 +0000 (21:59 +0000)]
am
05f9da8e: Merge "Add \'adb shell telecom\' command to packages list" into mnc-dev
* commit '
05f9da8e6f778c44031b957ccd2f91bde83baa6e':
Add 'adb shell telecom' command to packages list
Yorke Lee [Wed, 3 Jun 2015 21:39:39 +0000 (21:39 +0000)]
Merge "Add 'adb shell telecom' command to packages list" into mnc-dev
Yorke Lee [Wed, 3 Jun 2015 20:57:33 +0000 (13:57 -0700)]
Add 'adb shell telecom' command to packages list
Change-Id: I193b54dd9f4511eb7959c5dbbf38f90267b8fcc9
Mark Salyzyn [Wed, 3 Jun 2015 19:17:50 +0000 (19:17 +0000)]
am
9f8e1e1c: goldfish: rename goldfish_logcat.te to logd.te
* commit '
9f8e1e1c7dc022600477d151e1d0341c16528012':
goldfish: rename goldfish_logcat.te to logd.te
Nick Kralevich [Wed, 3 Jun 2015 18:54:49 +0000 (11:54 -0700)]
resolved conflicts for merge of
94871b94 to mnc-dev-plus-aosp
Bug:
19608716
Change-Id: Ic3b44e97fb8731794e5bdaf57db072640cae0737
Ying Wang [Wed, 3 Jun 2015 18:36:24 +0000 (18:36 +0000)]
am
56ea339a: am
3a35aa1a: Merge "Add selinux and verity support to custom image generation."
* commit '
56ea339a6008b81f885274a6446c68dc240dafe7':
Add selinux and verity support to custom image generation.
Ying Wang [Wed, 3 Jun 2015 18:36:23 +0000 (18:36 +0000)]
am
abffa466: (-s ours) am
b7e6e8bb: Merge "Support to configure and build multiple custom images."
* commit '
abffa466cc4469d389da3c22ee929cd6f216887d':
Support to configure and build multiple custom images.
Mark Salyzyn [Wed, 3 Jun 2015 18:36:22 +0000 (18:36 +0000)]
am
70749857: am
9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te"
* commit '
70749857595a100bf9e8f009767030812101d365':
goldfish: rename goldfish_logcat.te to logd.te
Ying Wang [Wed, 3 Jun 2015 18:36:20 +0000 (18:36 +0000)]
am
3bb1bea9: am
9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '
3bb1bea968f4cc3754cacad1ec41ac01cc6cf259':
Add VeritySigner.jar to ota tools
Tao Bao [Wed, 3 Jun 2015 18:36:17 +0000 (18:36 +0000)]
am
1ef34d34: am
54310d1a: Merge "Fix the wrong error message"
* commit '
1ef34d3440db524d6ea2e0a6d4e72b668765d293':
Fix the wrong error message
Luan Nguyen [Wed, 3 Jun 2015 18:25:23 +0000 (18:25 +0000)]
am
95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '
95a1818f50c685f903635ae84076199015cc9c78':
docs: Add styles for embedded videos to match DevSite
Luan Nguyen [Wed, 3 Jun 2015 18:13:16 +0000 (18:13 +0000)]
Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
Mark Salyzyn [Wed, 3 Jun 2015 16:00:14 +0000 (09:00 -0700)]
goldfish: rename goldfish_logcat.te to logd.te
(cherrypicked from commit
fd8c30177c472fe1cbff30312144b2a0b231bd35)
Bug:
19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18
Mark Salyzyn [Wed, 3 Jun 2015 14:50:31 +0000 (07:50 -0700)]
goldfish: logcat -Q in logd domain
Deal with a build failure in conflict with cl/152105
(cherrypicked from commit
1cc7735ffa5194b9651429b2a96d6f6f319ca5eb)
Bug:
19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
Mark Salyzyn [Wed, 3 Jun 2015 17:43:28 +0000 (17:43 +0000)]
am
defa1737: am
b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit '
defa1737973575e3be2dce415c68c6b13fb4fbd0':
goldfish: logcat -Q in logd domain
Ying Wang [Wed, 3 Jun 2015 17:11:11 +0000 (17:11 +0000)]
am
3a35aa1a: Merge "Add selinux and verity support to custom image generation."
* commit '
3a35aa1a2c1f3af3216875dd59a5bb21629b7c7f':
Add selinux and verity support to custom image generation.
Ying Wang [Wed, 3 Jun 2015 17:11:10 +0000 (17:11 +0000)]
am
b7e6e8bb: Merge "Support to configure and build multiple custom images."
* commit '
b7e6e8bb6d00dc2677b297e548aff92f97066ab5':
Support to configure and build multiple custom images.
Ying Wang [Wed, 3 Jun 2015 16:59:01 +0000 (16:59 +0000)]
Merge "Add selinux and verity support to custom image generation."
Ying Wang [Wed, 3 Jun 2015 16:58:46 +0000 (16:58 +0000)]
Merge "Support to configure and build multiple custom images."
Luan Nguyen [Tue, 2 Jun 2015 19:18:54 +0000 (12:18 -0700)]
docs: Add styles for embedded videos to match DevSite
Change-Id: I68cc9a7340db43fd23d7072bf867d53a2e180c4c
Ying Wang [Sat, 21 Mar 2015 00:43:02 +0000 (17:43 -0700)]
Add selinux and verity support to custom image generation.
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE
Also changed the staging directory name to the mount point, like we do
for other images built by the build system.
Bug:
19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
(cherry picked from commit
7d51a4029590b58e22071eed919d59a0ff205bef)
Ying Wang [Fri, 13 Mar 2015 01:30:39 +0000 (18:30 -0700)]
Support to configure and build multiple custom images.
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
Each makefile configures an image.
For image configuration makefile foo/bar/xyz.mk, the built image
file name
will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
- CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
etc.
- CUSTOM_IMAGE_PARTITION_SIZE
- CUSTOM_IMAGE_FILE_SYSTEM_TYPE
- CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
accepted by BuildImage() in tools/releasetools/build_image.py.
- CUSTOM_IMAGE_MODULES, a list of module names you want to include
in the image; Not only the module itself will be installed to proper
path in the image, you can also piggyback additional files/directories
with the module's LOCAL_PICKUP_FILES.
- CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
the image. <dest> is relativ to the root of the image.
To build all those images, run "make custom_images".
Bug:
19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit
5fcf1094f9cf4d57c2598237f99621f254130d71)
Mark Salyzyn [Wed, 3 Jun 2015 16:52:50 +0000 (16:52 +0000)]
am
9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te"
* commit '
9ec84792b8f3faad150c68909055046b3bc272c1':
goldfish: rename goldfish_logcat.te to logd.te
Ying Wang [Wed, 3 Jun 2015 16:52:49 +0000 (16:52 +0000)]
am
9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '
9fed6369b6ee4ad07a0313fa5321047be1d79b85':
Add VeritySigner.jar to ota tools
Mark Salyzyn [Wed, 3 Jun 2015 16:45:26 +0000 (16:45 +0000)]
Merge "goldfish: rename goldfish_logcat.te to logd.te"
Ying Wang [Wed, 3 Jun 2015 16:42:17 +0000 (16:42 +0000)]
Merge "Add VeritySigner.jar to ota tools"
Claes Elgemark [Tue, 2 Jun 2015 09:59:32 +0000 (11:59 +0200)]
Add VeritySigner.jar to ota tools
Used by verity_signer
Change-Id: I6e2b654144b40573c3f3c0dc0d1c943889ffcd7d
Tao Bao [Wed, 3 Jun 2015 16:40:08 +0000 (16:40 +0000)]
am
54310d1a: Merge "Fix the wrong error message"
* commit '
54310d1a0dc7a3ceaaee9f4cee7b1f8b7bfbf7de':
Fix the wrong error message
Tao Bao [Wed, 3 Jun 2015 16:30:20 +0000 (16:30 +0000)]
Merge "Fix the wrong error message"
Tao Bao [Wed, 3 Jun 2015 16:24:08 +0000 (09:24 -0700)]
Fix the wrong error message
apply_patch_space() checks the free space on /cache, not /system.
Change-Id: I70996d5cd5a81fe4871ee738bddb1437e8df6fb9
Mark Salyzyn [Wed, 3 Jun 2015 16:00:46 +0000 (16:00 +0000)]
am
b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit '
b37ac46bb40e24b1014010735abc5e63802ca3bb':
goldfish: logcat -Q in logd domain
Mark Salyzyn [Wed, 3 Jun 2015 16:00:14 +0000 (09:00 -0700)]
goldfish: rename goldfish_logcat.te to logd.te
Bug:
19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18
Mark Salyzyn [Wed, 3 Jun 2015 15:47:18 +0000 (15:47 +0000)]
Merge "goldfish: logcat -Q in logd domain"
Mark Salyzyn [Wed, 3 Jun 2015 14:50:31 +0000 (07:50 -0700)]
goldfish: logcat -Q in logd domain
Deal with a build failure in conflict with cl/152105
Bug:
19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
Claes Elgemark [Tue, 2 Jun 2015 09:03:27 +0000 (11:03 +0200)]
Strip path from verity_signer_cmd in the target-files meta data.
Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.
Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
Tao Bao [Tue, 2 Jun 2015 21:09:12 +0000 (21:09 +0000)]
am
60dd04ec: Merge "Add post-install verification for BBOTAs" into mnc-dev
* commit '
60dd04ecfc94bd732c72287349f2fb910a0bbbef':
Add post-install verification for BBOTAs
Tao Bao [Tue, 2 Jun 2015 18:28:30 +0000 (18:28 +0000)]
am
2e30a5e8: am
708c4623: Merge "Add post-install verification for BBOTAs"
* commit '
2e30a5e853a584b11db65c0703aff93c7f7870f8':
Add post-install verification for BBOTAs
Tao Bao [Tue, 2 Jun 2015 18:28:25 +0000 (18:28 +0000)]
Merge "Add post-install verification for BBOTAs" into mnc-dev
Tao Bao [Mon, 1 Jun 2015 20:40:49 +0000 (13:40 -0700)]
Add post-install verification for BBOTAs
Similar to the assertations in file-based OTA, we perform verification
for block-based OTAs (BBOTAs) after updating a partition, for both of
the incremental and full OTAs. It increases the update time (~20s on
Nexus 6), but will capture unnoticed errors right away.
Bug:
21500869
Change-Id: I0f8b27734caaa0f41f9c1b904d55af2112784a68
(cherry picked from commit
68658c0f4fe5420226df5849b642f98fb7f5d984)
Tao Bao [Tue, 2 Jun 2015 18:14:40 +0000 (18:14 +0000)]
am
708c4623: Merge "Add post-install verification for BBOTAs"
* commit '
708c462311afd63592a3adcc0e47c0c850b73444':
Add post-install verification for BBOTAs
Tao Bao [Tue, 2 Jun 2015 18:02:28 +0000 (18:02 +0000)]
Merge "Add post-install verification for BBOTAs"
Yohann Roussel [Tue, 2 Jun 2015 14:24:53 +0000 (14:24 +0000)]
am
a9dd74c3: Merge "Add support for RMTYPEDEF with Jack" into mnc-dev
* commit '
a9dd74c39515759599a3b01f7772de9f19325800':
Add support for RMTYPEDEF with Jack
Andrew Hsieh [Tue, 2 Jun 2015 14:24:12 +0000 (14:24 +0000)]
am
d760d467: Revert "Revert "Enable linker -fix-cortex-a53-843419""
* commit '
d760d4676bb50ce74e4cc9a2813c592c189d31c9':
Revert "Revert "Enable linker -fix-cortex-a53-843419""
Yohann Roussel [Tue, 2 Jun 2015 13:17:09 +0000 (13:17 +0000)]
am
546e6205: (-s ours) am
ea6de994: (-s ours) Merge "[DO NOT MERGE] Add support for RMTYPEDEF with Jack"
* commit '
546e62054cf5a2a352d79f33d06ce96dcaa91731':
[DO NOT MERGE] Add support for RMTYPEDEF with Jack
Yohann Roussel [Tue, 2 Jun 2015 13:07:52 +0000 (13:07 +0000)]
am
ea6de994: (-s ours) Merge "[DO NOT MERGE] Add support for RMTYPEDEF with Jack"
* commit '
ea6de994788bf90559ee75fc638328aa90d6853b':
[DO NOT MERGE] Add support for RMTYPEDEF with Jack
Yohann Roussel [Tue, 2 Jun 2015 12:58:37 +0000 (12:58 +0000)]
Merge "[DO NOT MERGE] Add support for RMTYPEDEF with Jack"
Yohann Roussel [Wed, 20 May 2015 15:52:15 +0000 (17:52 +0200)]
[DO NOT MERGE] Add support for RMTYPEDEF with Jack
Bug:
21099584
(cherry-picked from commit
5b2c6e26dbda66a2245f987db0428c2bf2eb7c95)
Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
Yohann Roussel [Tue, 2 Jun 2015 09:36:27 +0000 (09:36 +0000)]
Merge "Add support for RMTYPEDEF with Jack" into mnc-dev
Ying Wang [Tue, 2 Jun 2015 02:19:57 +0000 (19:19 -0700)]
Uncompress .so files before signing the apk.
- In uncompress-shared-libs we may strip .so files not for the current
TARGET_ARCH. So we need to strip first and then sign the apk.
- For PRESIGNED apks, make sure we don't strip the .so files even if
they are "fat".
Bug:
21571418
Bug:
8076853
Change-Id: Ifd1193dda0c2cd52ac148064ce5a32bcdd03f75c
Ying Wang [Fri, 1 May 2015 21:02:26 +0000 (14:02 -0700)]
Don't extract jni from prebuilt apks.
- We don't need LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES now, for we always
page-align jni shared libraries and store them umcompressed.
- For prebuilt apks, we don't extract jni any more; Instead we always run
uncompress-shared-libs on them.
- For apks built from source, we still install the jni separately, because
that way multiple apks can share the same jni and it saves space.
With this change, for most prebuilt apks, we don't need to specify
LOCAL_PREBUILT_JNI_LIBS ("@lib/<abi>/foo.so") any more, for the build
system automatically replaces the embedded jni with uncompressed files;
But if a prebuilt is a fat apk (i.e. containing jni not needed by the
current product architecture), you still need LOCAL_PREBUILT_JNI_LIBS to
specify what jni to keep. Otherwise all embedded jni will be replaced with
uncompressed files, that wastes space.
Bug:
8076853
Change-Id: Ic3666dc72bf17cd293787414dd185470b365f967
Andrew Hsieh [Mon, 11 May 2015 06:03:07 +0000 (06:03 +0000)]
Revert "Revert "Enable linker -fix-cortex-a53-843419""
This reverts commit
32e1689684682aadf1a5d5af523ccafae5907572.
Now that prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9 is also updated
Change-Id: Id95c1c4cc651c434461655e62b8f23afd56b53e4
Tao Bao [Mon, 1 Jun 2015 20:40:49 +0000 (13:40 -0700)]
Add post-install verification for BBOTAs
Similar to the assertations in file-based OTA, we perform verification
for block-based OTAs (BBOTAs) after updating a partition, for both of
the incremental and full OTAs. It increases the update time (~20s on
Nexus 6), but will capture unnoticed errors right away.
Bug:
21500869
Change-Id: I89ac8fe623b855721b7affd07cf9426a23433ab0
Clay Murphy [Mon, 1 Jun 2015 19:29:07 +0000 (19:29 +0000)]
am
2094344f: am
b7bb040c: Merge "Docs: Update link to new Community page location"
* commit '
2094344fb3b35a6d2bae227e65946515e5fea84a':
Docs: Update link to new Community page location
Clay Murphy [Mon, 1 Jun 2015 19:16:46 +0000 (19:16 +0000)]
am
b7bb040c: Merge "Docs: Update link to new Community page location"
* commit '
b7bb040c75922795b47434e09cd09842ad11fd46':
Docs: Update link to new Community page location
Clay Murphy [Mon, 1 Jun 2015 19:04:56 +0000 (19:04 +0000)]
Merge "Docs: Update link to new Community page location"
Ying Wang [Mon, 1 Jun 2015 18:51:57 +0000 (18:51 +0000)]
am
4fe7bfd3: Add /lib[64] to host binary\'s rpath.
* commit '
4fe7bfd373d99dedfd2e63135da5189478bb0138':
Add $ORIGIN/lib[64] to host binary's rpath.
Ying Wang [Mon, 1 Jun 2015 18:50:00 +0000 (18:50 +0000)]
am
9cc3b757: am
91c2f705: Merge "Add /lib[64] to host binary\'s rpath."
* commit '
9cc3b7572c29184d77f477df2b0376fc2f4b589a':
Add $ORIGIN/lib[64] to host binary's rpath.
Ying Wang [Mon, 1 Jun 2015 18:37:12 +0000 (18:37 +0000)]
am
91c2f705: Merge "Add /lib[64] to host binary\'s rpath."
* commit '
91c2f7053d131cb9449eccfda97ec80130dbf451':
Add $ORIGIN/lib[64] to host binary's rpath.
Ying Wang [Mon, 1 Jun 2015 18:29:13 +0000 (18:29 +0000)]
Merge "Add $ORIGIN/lib[64] to host binary's rpath."
Ying Wang [Mon, 1 Jun 2015 17:43:29 +0000 (10:43 -0700)]
Add $ORIGIN/lib[64] to host binary's rpath.
Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries
in the bin subdirectory;
For historical reason the binaries in the SDK package don't have a bin
subdirectory. This workaround enables them to work in the existing SDK
directory structure.
Bug:
21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
(cherry-pick from commit
4fe7bfd373d99dedfd2e63135da5189478bb0138)
Ying Wang [Mon, 1 Jun 2015 17:43:29 +0000 (10:43 -0700)]
Add $ORIGIN/lib[64] to host binary's rpath.
Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries
in the bin subdirectory;
For historical reason the binaries in the SDK package don't have a bin
subdirectory. This workaround enables them to work in the exsiting SDK
directory structure.
Bug:
21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
Chih-Hung Hsieh [Mon, 1 Jun 2015 15:27:08 +0000 (15:27 +0000)]
am
ad2494bb: Remove gcc 4.9 workaround.
* commit '
ad2494bb79932c4f2fd55f51e9b0d58676502558':
Remove gcc 4.9 workaround.
Chih-Hung Hsieh [Fri, 29 May 2015 20:36:19 +0000 (20:36 +0000)]
am
8b79abfb: am
c2be68e4: Merge "Remove gcc 4.9 workaround."
* commit '
8b79abfb4458193ee28949882a712b03e7828c53':
Remove gcc 4.9 workaround.
Chih-Hung Hsieh [Fri, 29 May 2015 20:28:08 +0000 (20:28 +0000)]
am
c2be68e4: Merge "Remove gcc 4.9 workaround."
* commit '
c2be68e4f688f61ea5c23183b8eaeb4e34aa1c56':
Remove gcc 4.9 workaround.
Chih-Hung Hsieh [Fri, 29 May 2015 20:16:23 +0000 (20:16 +0000)]
Merge "Remove gcc 4.9 workaround."
Chih-Hung Hsieh [Fri, 29 May 2015 17:23:15 +0000 (10:23 -0700)]
Remove gcc 4.9 workaround.
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.
BUG:
19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
(cherry picked from commit
ad2494bb79932c4f2fd55f51e9b0d58676502558)
Chih-Hung Hsieh [Fri, 29 May 2015 17:23:15 +0000 (10:23 -0700)]
Remove gcc 4.9 workaround.
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.
BUG:
19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
Ying Wang [Fri, 29 May 2015 17:24:08 +0000 (17:24 +0000)]
am
d4109350: am
6106f320: Merge "Do not add \'adb\' to persist.sys.usb.config if already there"
* commit '
d41093507b4e417b23e5172d11319312ce6c3add':
Do not add 'adb' to persist.sys.usb.config if already there
Ying Wang [Fri, 29 May 2015 17:09:13 +0000 (17:09 +0000)]
am
6106f320: Merge "Do not add \'adb\' to persist.sys.usb.config if already there"
* commit '
6106f320d3cf4b76774046faf2d843c5b13db593':
Do not add 'adb' to persist.sys.usb.config if already there
Ying Wang [Fri, 29 May 2015 16:55:04 +0000 (16:55 +0000)]
Merge "Do not add 'adb' to persist.sys.usb.config if already there"
Oreste Salerno [Wed, 20 May 2015 16:44:48 +0000 (16:44 +0000)]
Do not add 'adb' to persist.sys.usb.config if already there
The 'adb' configuration might have already been added by a
device-specific Makefile, so add it only if it's not already there.
Change-Id: I6f96645f44c96f6f827cc8c842a8b769f92be13a
Elliott Hughes [Fri, 29 May 2015 05:07:20 +0000 (05:07 +0000)]
am
a6b14661: am
1a81a0ef: Merge "[MIPS] Do not use compact branches until GDB supports them"
* commit '
a6b14661687d8da6a8f566dd2fb104986b411565':
[MIPS] Do not use compact branches until GDB supports them
Christopher Ferris [Fri, 29 May 2015 05:07:18 +0000 (05:07 +0000)]
am
ce78cf40: am
6bd0bbd5: Merge "Portable way to color"
* commit '
ce78cf40a4dbdfe2644215102c1269a4e72bec8b':
Portable way to color
Elliott Hughes [Fri, 29 May 2015 04:54:33 +0000 (04:54 +0000)]
am
1a81a0ef: Merge "[MIPS] Do not use compact branches until GDB supports them"
* commit '
1a81a0efca84990648a0b0f023b8a270226303ae':
[MIPS] Do not use compact branches until GDB supports them
Elliott Hughes [Fri, 29 May 2015 04:41:26 +0000 (04:41 +0000)]
Merge "[MIPS] Do not use compact branches until GDB supports them"
Dirk Dougherty [Thu, 28 May 2015 22:35:53 +0000 (22:35 +0000)]
am
bdbf0741: am
f89524c8: am
6c231420: Merge "increment metadata versions." into mnc-preview-docs
* commit '
bdbf074186275fcfbe90293fc1da26da837fd32d':
increment metadata versions.
Dirk Dougherty [Thu, 28 May 2015 22:35:04 +0000 (22:35 +0000)]
am
b9c10368: am
fa370efd: am
11d3d486: Increment css versions for appengine\'s benefit.
* commit '
b9c103680edf7ad7c68997ef7ac5b021442a2849':
Increment css versions for appengine's benefit.
Jeff Sharkey [Thu, 28 May 2015 22:34:32 +0000 (22:34 +0000)]
am
c2fb6e10: Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev
* commit '
c2fb6e107d81e50a58fe25073f490b9dd48b31e2':
Both ext4 and f2fs binaries for adoptable storage.
Christopher Ferris [Thu, 28 May 2015 22:30:55 +0000 (22:30 +0000)]
am
6bd0bbd5: Merge "Portable way to color"
* commit '
6bd0bbd5ebf059affcb826dc7a4a874bae0b09c4':
Portable way to color
Christopher Ferris [Thu, 28 May 2015 22:00:09 +0000 (22:00 +0000)]
Merge "Portable way to color"
Dirk Dougherty [Thu, 28 May 2015 21:36:26 +0000 (21:36 +0000)]
am
f89524c8: am
6c231420: Merge "increment metadata versions." into mnc-preview-docs
* commit '
f89524c80bb2fa6550fff1ff3bed6a257a80f64a':
increment metadata versions.
Dirk Dougherty [Thu, 28 May 2015 21:24:53 +0000 (21:24 +0000)]
am
6c231420: Merge "increment metadata versions." into mnc-preview-docs
* commit '
6c2314206fd4500500062fa2f774d4deb498ec58':
increment metadata versions.
Dirk Dougherty [Thu, 28 May 2015 21:07:41 +0000 (21:07 +0000)]
Merge "increment metadata versions." into mnc-preview-docs
Dirk Dougherty [Thu, 28 May 2015 21:06:12 +0000 (14:06 -0700)]
increment metadata versions.
Change-Id: I6e620f7ec2059ed864ebaad68585c4f97e2caf46
Dirk Dougherty [Thu, 28 May 2015 20:24:07 +0000 (20:24 +0000)]
am
fa370efd: am
11d3d486: Increment css versions for appengine\'s benefit.
* commit '
fa370efd837324524ff4f49202fe8f99a9ff52f6':
Increment css versions for appengine's benefit.