summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-24Merge "remove TARGET_PROVIDES_INIT_RC"HEADmastermainTom Cherry
2015-08-24remove TARGET_PROVIDES_INIT_RCTom Cherry
Change-Id: I372e156bc193c6ac76a5987f2f3456e765c491ef
2015-08-08Merge "updater: Switch to C++ and fix the build."android-m-preview-2Tao Bao
2015-08-07updater: Switch to C++ and fix the build.Tao Bao
Change-Id: I9e95a72df763a33c5ee7f7de933f5bdd2c669603
2015-05-06Merge "Whitelist device for stlport."android-m-preview-1android-m-previewDan Albert
2015-05-06Whitelist device for stlport.Dan Albert
Bug: http://b/15193147 Change-Id: Ia5c183c0f0ffa3c750c6a842b801d4f41772e69a
2015-04-01Merge "Drop BOARD_SEPOLICY_UNION."android-wear-5.1.1_r1android-wear-5.1.0_r1master-soongNick Kralevich
2015-04-01Drop BOARD_SEPOLICY_UNION.Stephen Smalley
As suggested in the comments on https://android-review.googlesource.com/#/c/141560/ drop BOARD_SEPOLICY_UNION and simplify the build_policy logic. Union all files found under BOARD_SEPOLICY_DIRS. Change-Id: I4214893c999c23631f5456cb1b8edd59771ef13b Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-02-28am a7db2611: Merge "manta: label boot block device"Nick Kralevich
* commit 'a7db2611c14c66a965737ba9b5ba08bdc171d0de': manta: label boot block device
2015-02-28Merge "manta: label boot block device"Nick Kralevich
2015-02-28manta: label boot block deviceNick Kralevich
Bug: 19534538 Change-Id: I9356373d570b483dea4fb2f9534407973d00f55a
2015-02-20am 13245156: Merge "Add missing include."Elliott Hughes
* commit '132451561fc9dd18139600c0fa9d71c439c5ad4d': Add missing include.
2015-02-20Merge "Add missing include."Elliott Hughes
2015-02-19Add missing include.Elliott Hughes
Change-Id: Ifbe66e61033179d1a5f8edcf423a4d84c936c616
2015-01-31am ce562e90: Merge "Fix "error: \'strerror\' was not declared in this scope"."Elliott Hughes
* commit 'ce562e906adc00aa191d8240cd66d60961d6f863': Fix "error: 'strerror' was not declared in this scope".
2015-01-31am 4a32d6c5: Merge "Fix "error: use of undeclared identifier \'memset\'"."Elliott Hughes
* commit '4a32d6c58c39382e072887cea5fd5f66015712db': Fix "error: use of undeclared identifier 'memset'".
2015-01-31Merge "Fix "error: 'strerror' was not declared in this scope"."Elliott Hughes
2015-01-30Fix "error: 'strerror' was not declared in this scope".Elliott Hughes
Change-Id: I6c941806eb7f273cfab9892aeb2999f6e5852758
2015-01-31Merge "Fix "error: use of undeclared identifier 'memset'"."Elliott Hughes
2015-01-30Fix "error: use of undeclared identifier 'memset'".Elliott Hughes
Change-Id: I76deb5b949862e5e0cdbd26e822a97877c51762a
2015-01-22am fdb7a75a: Change Exynos.H263.Encoder alignment to 4x4.Ronghua Wu
* commit 'fdb7a75a3a325cf3a3e1d8adc58222bffef09987': Change Exynos.H263.Encoder alignment to 4x4.
2015-01-21Change Exynos.H263.Encoder alignment to 4x4.lollipop-mr1-devRonghua Wu
Bug: 19014147 Change-Id: Id6b0821ddc0abff51f83f8f1c5bda11d3c167027
2015-01-13am 5347b713: manta: update prebuilt kernel (DO NOT MERGE)Mark Salyzyn
* commit '5347b7139a5305a441f79091135cadf1ad01002f': manta: update prebuilt kernel (DO NOT MERGE)
2015-01-13manta: update prebuilt kernel (DO NOT MERGE)Mark Salyzyn
a19d236 manta: manta_defconfig: enable CONFIG_CRYPTO_AES_ARM_BS 719d37e ARM: pull in <asm/simd.h> from asm-generic be74b54 ARM: move VFP init to an earlier boot stage 494ec49 crypto: create generic version of ablk_helper c032fbc ARM: add support for kernel mode NEON 8ea7e14 manta: manta_defconfig: enable CONFIG_CRYPTO_AES_ARM 169835d ARM: 8120/1: crypto: sha512: add ARM NEON implementation a017230 ARM: 8119/1: crypto: sha1: add ARM NEON implementation 42830b4 ARM: 8118/1: crypto: sha1/make use of common SHA-1 structures 37a01fd crypto: arm-aes - fix encryption of unaligned data d7f7f5f CRYPTO: Fix more AES build errors 4fb9935 ARM: add .gitignore entry for aesbs-core.S f8f8225 ARM: add support for bit sliced AES using NEON instructions 9a3b19f ARM: move AES typedefs and function prototypes to separate header 4b56d29 ARM: 7837/3: fix Thumb-2 bug in AES assembler code 4106bb0 ARM: 7723/1: crypto: sha1-armv4-large.S: fix SP handling e2cb914 ARM: 7626/1: arm/crypto: Make asm SHA-1 and AES code Thumb-2 compatible fe7f723 arm/crypto: Add optimized AES and SHA1 routines Bug: 18378796 Change-Id: Iecd9fb57a282d4fa33ca8498590cc9ce5cbef33d
2015-01-05am afea6448: Merge "Remove obsolete dalvik.gc.type-precise"Brian Carlstrom
* commit 'afea6448ab97b0f884fadd9f765bcb71ed86eefb': Remove obsolete dalvik.gc.type-precise
2015-01-05Merge "Remove obsolete dalvik.gc.type-precise"Brian Carlstrom
2015-01-05Remove obsolete dalvik.gc.type-preciseBrian Carlstrom
Bug: 18895001 (cherry picked from commit 3d08a21ded00d3fe0ae7936c5399ba9bd97cef55) Change-Id: I799bb37fc078a6881fb8fe33509debf1c5543133
2015-01-05Remove obsolete dalvik.gc.type-preciseBrian Carlstrom
Bug: 18895001 Change-Id: I2d32c33288d3ae9ed2a11d52bb0775c96c8b6270
2014-12-16am c3c89df4: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
* commit 'c3c89df4edc8fb2582faa1a5a54dbb9d7cf00e28': Cleanup Obsolete LOCAL_PRELINK_MODULE.
2014-12-16Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
2014-12-16Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang
Bug: 18675947 Change-Id: Idbf25db61cecb2016a506b75028ce675f6e5294b
2014-12-12am 70fe6802: Merge "Revert "Add default property to manta that allows bootup ↵Mark Salyzyn
directly from charger mode"" into lmp-mr1-dev * commit '70fe6802f25884e0700d6f26ea0b2a2a2e99eae2': Revert "Add default property to manta that allows bootup directly from charger mode"
2014-12-12am eb3805c9: manta: update prebuilt kernelMark Salyzyn
* commit 'eb3805c9bd26ac347bffc1490fa85032f8ddf38e': manta: update prebuilt kernel
2014-12-11Merge "Revert "Add default property to manta that allows bootup directly ↵Mark Salyzyn
from charger mode"" into lmp-mr1-dev
2014-12-11manta: update prebuilt kernelMark Salyzyn
07536b0 net: ipv6: allow choosing optimistic addresses with use_optimistic Bug: 17769720 Bug: 18609055 Change-Id: I9aca6c60e89ffe5b8b0285f65bff9cbd85e08e34
2014-12-11Revert "Add default property to manta that allows bootup directly from ↵Mark Salyzyn
charger mode" This reverts commit ee3f1039c6d98db35072eecac69b6a71bd8b76e4. Bug: 18590315 Change-Id: I2e95cb5ecaeda8803709220b17a210991993ed3e
2014-12-09am 55d2d5fb: manta: update prebuilt kernelRiley Andrews
* commit '55d2d5fb4b57edad2a6384e0bea9555b7e7ed773': manta: update prebuilt kernel
2014-12-08manta: update prebuilt kernelRiley Andrews
8084756 Merge remote-tracking branch 'origin/android-exynos-3.4' into HEAD 30f977e mali: Add GPU Busy Notifier 274e579 mali: Add Compute Job notifier bc8f709 mali: Fix use of uninitialized variable cfa6cd1 mali: Fix case not using highmem on manta. 47bb197 Revert "Revert "mali: ARM Mali driver kernel pre-r5p0 [revision 2608345 (Persimmon)]"" Bug: 17880265 Bug: 18380818 Bug: 17344013 Bug: 18375664 Change-Id: I8a84be5f9385b5ecc391c5dedfad6d27d663cb3e
2014-12-03am e35cd167: Merge "Remove journaling from read-only FS to save space" into ↵JP Abgrall
lmp-mr1-dev * commit 'e35cd167649cdb781587089df5395483e0b53920': Remove journaling from read-only FS to save space
2014-12-03Merge "Remove journaling from read-only FS to save space" into lmp-mr1-devJP Abgrall
2014-12-02am 3482ed87: manta: update prebuilt kernelMark Salyzyn
* commit '3482ed870aa06482ae48d87f1a3cb86fe6ae72e8': manta: update prebuilt kernel
2014-12-02manta: update prebuilt kernelMark Salyzyn
efe5df0 cgroup: remove synchronize_rcu() from cgroup_attach_{task|proc}() 0deda59 net: ipv6: Add a sysctl to make optimistic addresses useful candidates 2e5e064 um: add missing declaration of getrlimit() and friends e01bd6b cpufreq: Avoid using global variable total_cpus e4ac161 power: Avoids bogus error messages for the suspend aborts. Bug: 18081205 Bug: 17769720 Bug: 15413527 Change-Id: Ia8d5048f6cc2a841cc2acf66ddab298dc3b1a498
2014-12-02Remove journaling from read-only FS to save spaceJP Abgrall
The read-only partitions don't need journaling. Bug: 18430740 Change-Id: I93303aae534f02c6ae412323c9ebb0c0b7b35290
2014-11-26am b1a689fc: Revert "manta: update prebuilt kernel [Persimmon DDK]"Mark Salyzyn
* commit 'b1a689fc5264202bd39f4614e23236f910f3658f': Revert "manta: update prebuilt kernel [Persimmon DDK]"
2014-11-25Revert "manta: update prebuilt kernel [Persimmon DDK]"Mark Salyzyn
This reverts commit 24d0866ed28f4893956bbe7951a9ae2cfd684562. Bug: 18486857 Change-Id: I610a72bf1522bfc47cf4bd506ed330a05adf5496
2014-11-20am 90f4857c: Merge "Remove samsung/manta no-op."Elliott Hughes
* commit '90f4857ca8b2812543b6a1da1de23371dfb748b0': Remove samsung/manta no-op.
2014-11-20Merge "Remove samsung/manta no-op."android-wear-5.0.0_r1lollipop-wear-releaseElliott Hughes
2014-11-20Remove samsung/manta no-op.Elliott Hughes
Change-Id: Ia30b6a91d90e1aef43289faf76f8b110bcffe5c7
2014-11-19am dcb8bc60: Disable journaling to save system.img space.Ying Wang
* commit 'dcb8bc60bfc1f22290a6a30cc4314bb8725082b9': Disable journaling to save system.img space.
2014-11-18Disable journaling to save system.img space.Ying Wang
Bug: 18430740 Change-Id: I45720c59d3a379dda5fa171425fb71caa852b432