summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0Ian Pedowitz2015-08-111-1/+1
|\ | | | | | | | | * commit 'a18c5028d77f0323b8b8959982ae7d6b1ec7aded': Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
| * Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0Ian Pedowitz2015-08-111-1/+1
| | | | | | | | Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
* | am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4Ian Pedowitz2015-08-111-1/+1
|\ \ | |/ | | | | | | * commit '38ffb0cf899d94cb72409519bd25dc94048dd719': Bump PLATFORM_PREVIEW_SDK_VERSION to 4
| * Bump PLATFORM_PREVIEW_SDK_VERSION to 4Ian Pedowitz2015-08-111-1/+1
| | | | | | | | Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
* | Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" ↵Furquan Shaikh2015-08-092-3/+5
|\ \ | | | | | | | | | into mnc-dr-dev
| * | vboot_signer: Add kernel subkey required for signing kernel keyblockFurquan Shaikh2015-08-072-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the keyblock was being generated using data_key.vbprivk. However, we need to use kernel_subkey.vbprivk for kernel keyblock generation. This did not create any issues until now because dev-mode just throws a message saying that keyblock is invalid. But, normal-mode does not boot if keyblock is invalid. Add extra parameter for passing in kernel subkey to vboot_signer script. TEST="make bootimage-nodeps" generates correctly signed boot.img. Verified that the image boots fine in normal mode. Change-Id: I0fc2183b466e34ddf1d98c9532072548504fcec4 Signed-off-by: Furquan Shaikh <furquan@google.com>
* | | am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-devYusuf Ozuysal2015-08-071-1/+2
|\ \ \ | | |/ | |/| | | | | | | * commit '736463f86cbe4a5d6b1b9333ee0eab4f9ebd5a70': Add support-customtabs to the doc build.
| * | Merge "Add support-customtabs to the doc build." into mnc-devYusuf Ozuysal2015-08-071-1/+2
| |\ \
| | * | Add support-customtabs to the doc build.Benoit Lize2015-07-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | b/22795013 Change-Id: I1363e5136ca15ea3089040d59de528c877fb53df
* | | | am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.Ying Wang2015-08-031-12/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '66c8e8c756fb1790cac792b32ba2de057c3b1b4e': Don't prepend CC_WRAPPER to CLANG.
| * | | Don't prepend CC_WRAPPER to CLANG.Ying Wang2015-08-031-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We have deferred the CC_WRAPPER prepending to binary.mk per module. Bug: 22612634 Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
* | | | am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-devDianne Hackborn2015-07-311-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '56866c4d0e31bbc65e333754bb69accb2b0f4a36': Remove M codename, version number is 6.0.
| * | | Merge "Remove M codename, version number is 6.0." into mnc-devDianne Hackborn2015-07-311-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Remove M codename, version number is 6.0.Dianne Hackborn2015-07-291-2/+2
| | | | | | | | | | | | | | | | Change-Id: I27b477f087b135232f14157123d31da04dee04d7
* | | | am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-devTony Mantler2015-07-301-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5915e57db504914c02d36e8f8cc18767c40f9c2d': Add support preference libraries to docs build
| * | | Merge "Add support preference libraries to docs build" into mnc-devTony Mantler2015-07-301-1/+4
| |\ \ \
| | * | | Add support preference libraries to docs buildTony Mantler2015-07-301-1/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | b/22795957 Change-Id: Ia8e02fd7726102f524a16f2f84e9c2bdd4d37f8f
* | | | am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat ↵Miao Wang2015-07-291-4/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | build." into mnc-dev * commit 'fbf80e9d6294c9ab1989572faab888e4f8641b1c': [RenderScript] Only upgrade RS target API for compat build.
| * | | Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-devMiao Wang2015-07-291-4/+6
| |\ \ \
| | * | | [RenderScript] Only upgrade RS target API for compat build.Miao Wang2015-07-291-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix build Bug: 22796994 Bug: 22693954 Change-Id: Iff91cc4691ea3e4cd8542cdf38245e2aa7724a71
* | | | | am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-devIan Pedowitz2015-07-291-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '96585b06dfb29023adc7097423c9ef266d13ac30': Bump PLATFORM_PREVIEW_SDK_VERSION to 3
| * | | | Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-devIan Pedowitz2015-07-291-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Bump PLATFORM_PREVIEW_SDK_VERSION to 3Ian Pedowitz2015-07-291-1/+1
| | |/ / | | | | | | | | | | | | Change-Id: I5a0ec062c2893bf1ac7fbec3ce98953283efcaf7
* | | | am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.Miao Wang2015-07-292-8/+20
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '302e944c6034060eb7ff51ea2a3abe740cf2c9b7': [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
| * | [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.Miao Wang2015-07-282-8/+20
| |/ | | | | | | | | | | | | | | | | | | | | | | Bug: 22796994 Bug: 22693954 This change fixes the RS_PREBUILT_LIBPATH when used with 64-bit target devices. It also fixes an issue where the target RenderScript API is below 21 for 64-bit compilation. In those cases, we should always upconvert it to 21 (since that is the first available 64-bit release). Change-Id: I27e9d0bd5c01bac0b3b28e9002333264a55d628f
* | am 215959e7: Revert "Revert "Hide unwinder symbols in each binary.""Dan Albert2015-07-221-0/+1
|\ \ | |/ | | | | | | * commit '215959e77d345899fbafa20f765b497b3ac37301': Revert "Revert "Hide unwinder symbols in each binary.""
| * Revert "Revert "Hide unwinder symbols in each binary.""Dan Albert2015-07-211-0/+1
| | | | | | | | | | | | | | | | | | Bug: 18471342 Bug: 19958712 This reverts commit 61f675bb53f31fb2500fc135603ca7a5f7620d8e. Change-Id: I87d3655d1238a9cf26d96dcb0665ba5110931800 (cherry picked from commit 686a5576890b3d5ea48ddc9da52b0c8aca75f876)
* | am c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]Ying Wang2015-07-215-60/+67
|\ \ | |/ | | | | | | * commit 'c671a7cf5cae42b61991d9b72e53d9d8a6ace84e': Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
| * Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]Ying Wang2015-07-205-60/+67
| | | | | | | | | | | | | | | | | | - Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix, so that we can disable the wrapper per module. - Disable ccache on a module when FDO is enabled. Bug: 22612634 Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
* | am 7ac6cb80: Add LOCAL_NO_LIBGCC.Ying Wang2015-07-163-0/+9
|\ \ | |/ | | | | | | * commit '7ac6cb804083a67d31a16b910dabfb76b30150a3': Add LOCAL_NO_LIBGCC.
| * Add LOCAL_NO_LIBGCC.Ying Wang2015-07-163-0/+9
| | | | | | | | | | | | | | | | This can be used to compile independent libraries without the need for libgcc.a. Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374 (cherry picked from commit 75011b2003733edc483a45d61f5cb1a23f64bfbf)
* | am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in ↵Ying Wang2015-07-161-2/+13
|\ \ | |/ | | | | | | | | | | apps_only build." into mnc-dev * commit 'e8ecab8d099f465d527f7bc0fbd04f26ac477a93': Don't uncompress/page-align the jni libraries in apps_only build.
| * Merge "Don't uncompress/page-align the jni libraries in apps_only build." ↵Ying Wang2015-07-161-2/+13
| |\ | | | | | | | | | into mnc-dev
| | * Don't uncompress/page-align the jni libraries in apps_only build.Ying Wang2015-07-151-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't uncompress/page-align the jni libraries in apps_only build, because the apk may be run on older platforms that don't support loading jni directly from apk. When prebuilt apks are installed to platform build, the build system will automatically uncompress/page-align the prebuit apks in M and downstream, so no need to uncompress/page-align in the apps_only build either. Bug: 22491084 Change-Id: I67e977b2592800ae467450592069843b4e5fc466
* | | am 087243dd: Merge "Add data binding to built javadoc." into mnc-devGeorge Mount2015-07-161-0/+15
|\ \ \ | |/ / | | | | | | | | | * commit '087243ddcb61b602f4d4eb03022844021a659fda': Add data binding to built javadoc.
| * | Merge "Add data binding to built javadoc." into mnc-devGeorge Mount2015-07-161-0/+15
| |\ \ | | |/ | |/|
| | * Add data binding to built javadoc.George Mount2015-07-131-0/+15
| | | | | | | | | | | | | | | | | | Bug 22175560 Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
* | | am 6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.pyThierry Strudel2015-07-132-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '6b74f21a4d3ff7ed7bb8463210263e9ecb27830a': oem_image/custom_image: fix missing new parameter to build_image.py
| * | oem_image/custom_image: fix missing new parameter to build_image.pyThierry Strudel2015-07-132-2/+2
| | | | | | | | | | | | | | | | | | Bug: 22441494 Change-Id: I0baa4db67ab7a17dc89193511702ed98e7515318 Signed-off-by: Thierry Strudel <tstrudel@google.com>
* | | Temporarily use blockimgdiff v2 for OTA.Tao Bao2015-07-121-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | angler and bullhead have smaller cache partiton (~100MB) and hit issue with incremental OTA (such as MDA09B to MDA12) that requires more stash space with BBOTA v3. Temporarily use v2 as a workaround, until we come up with a real fix. Note that BBOTA v2 still uses some stash space, but should be much smaller than v3. Bug: 22430577 Change-Id: Ic4c05f3609732e7d5140703062da9fe11df5c6d3
* | fix device specific fs_config on build serverThierry Strudel2015-07-101-14/+14
|/ | | | | | | | | | | | | | | | fs_config function from libcutils, in order to properly set the xattr FS used to define device specific uid, gid, permissions and capabilities, now needs TARGET_OUT make variable to be passed explicitly to all tools using it: fs_config fs_get_stats used by mktarball.sh make_ext4fs used by mkuserimg.sh mksquashfs used by mksquashfsimage.sh Bug: 21989305 Bug: 22048934 Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded Signed-off-by: Thierry Strudel <tstrudel@google.com>
* Retry adjusting the size computation for reserved blocks.Tao Bao2015-06-291-1/+13
| | | | | | | | | | | | | | | | | Due to the change in https://lwn.net/Articles/546473/, kernel reserves a few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to OTA update failures. Adjust the size computation if the device has BOARD_HAS_EXT4_RESERVED_BLOCKS := true. It amends the last attemp in [1]. Now it computes the used blocks from the make_ext4fs output, instead of altering its argument. [1]: commit efbb5d2e692283be32069e808b88522727c7fe98. Bug: 21522719 Bug: 22023465 Bug: 22174684 Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
* Revert "Adjust the size computation for reserved blocks"Tao Bao2015-06-291-14/+1
| | | | | | | | | We should not change the parameter to mkfs_ext4. Bug filed at b/22174684. Will come up with a new CL. This reverts commit efbb5d2e692283be32069e808b88522727c7fe98. Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
* Raise API level to 23.Dianne Hackborn2015-06-261-1/+1
| | | | | | Now apps can target both MNC and 23. Change-Id: Ife6a844dc1a12b5d37973cbb890434c950dab7aa
* Raise progaurd library to platform libraries even for "current" SDK.Ying Wang2015-06-261-2/+2
| | | | | | | | | | | Without this change, if an app with "LOCAL_SDK_VERSION := current" links against a static library that uses removed APIs, the app will fail ProGuard processing because the removed APIs can't be found in the current SDK. This works around the issue. Bug: 18510449 Bug: 20667396 Change-Id: Ia6e2a81cf5ecba972d155e56238ea946f8539411
* resolved conflicts for merge of 1a4658cd to mnc-devMohamad Ayyash2015-06-251-1/+1
|\
| * resolved conflicts for merge of ef5dc90b to lmp-mr1-ub-devMohamad Ayyash2015-06-242-1/+20
| |\
| | * Add img2simg in host and ota packagesMohamad Ayyash2015-06-242-1/+3
| | | | | | | | | | | | | | | Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* | | Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-devSimon Wilson2015-06-241-0/+2
|\ \ \
| * \ \ resolved conflicts for merge of ecfc97f7 to mnc-devSimon Wilson2015-06-241-0/+2
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
generated by cgit v1.1 at 2025-03-16 10:34:18 +0000