summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of e2c7d491 to masterHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0Nick Kralevich2015-04-011-16/+0
|\ | | | | | | Change-Id: I17cc5534c68d6cc1f35d294af7870b7037843525
| * Merge "Drop BOARD_SEPOLICY_UNION."Nick Kralevich2015-04-011-11/+0
| |\
| | * Drop BOARD_SEPOLICY_UNION.Stephen Smalley2015-04-011-11/+0
| |/ | | | | | | | | | | | | | | | | | | 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>
* | Add Roboto fontsRoozbeh Pournader2015-02-251-0/+1
| | | | | | | | | | | | Roboto fonts are now moved to external/roboto-fonts. Change-Id: I667ad9fadb46662c8b66ae3f6666225a10aaf782
* | am a88a78db: Merge "Remove unused property."Elliott Hughes2015-01-291-1/+0
|\| | | | | | | | | * commit 'a88a78db8ed1ab29cd965bb8ec31d6cb74925b58': Remove unused property.
| * Merge "Remove unused property."Elliott Hughes2015-01-291-1/+0
| |\
| | * Remove unused property.Elliott Hughes2015-01-281-1/+0
| |/ | | | | | | Change-Id: Iae208ef208e7949ec9aef1f1147f96fda5e47224
* | am 49f39f7e: Merge "Remove unneeded PRODUCT_RUNTIMES."Ying Wang2014-12-161-3/+0
|\| | | | | | | | | * commit '49f39f7e794c81028ce30b1e16a99d3d837fab69': Remove unneeded PRODUCT_RUNTIMES.
| * Merge "Remove unneeded PRODUCT_RUNTIMES."Ying Wang2014-12-161-3/+0
| |\
| | * Remove unneeded PRODUCT_RUNTIMES.Ying Wang2014-12-081-3/+0
| |/ | | | | | | | | Bug: 18465297 Change-Id: I5463a2b8534d58083b3f8d1d79702de290e4aa44
* / Fix broken build.Nick Kralevich2014-10-141-0/+5
|/ | | | Change-Id: Ifda36488fcf2ebb6fec4fd9d0aa20e8eec899867
* Delete vendorsetup.sh which is used internally.staging/cm-12.1staging/cm-12.0-cafstable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.1cm-12.0leozwang2014-07-091-23/+0
| | | | Change-Id: Icf97c51e988f5b1cc8654d9ed0e986b788cad3ce
* Update Board config.leozwang2014-06-251-6/+23
| | | | | Bug: 15831391 Change-Id: I56fc621583cde5745801480b5d6f36c7ee4cf3c5
* am 8bcf4b7a: am 9eae7669: Merge "Remove dependencies on runtime_libdvm and ↵Brian Carlstrom2014-05-290-0/+0
|\ | | | | | | | | | | | | libdvm.so in general" * commit '8bcf4b7a6380b26c2b42dae00dd8443de2a8e12c': Remove dependencies on runtime_libdvm and libdvm.so in general
| * am 9eae7669: Merge "Remove dependencies on runtime_libdvm and libdvm.so in ↵Brian Carlstrom2014-05-291-25/+2
| |\ | | | | | | | | | | | | | | | | | | general" * commit '9eae76696fd2eba9eac4283343236a414792c7c0': Remove dependencies on runtime_libdvm and libdvm.so in general
| | * Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"Brian Carlstrom2014-05-291-25/+2
| | |\
| | | * Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-291-25/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit 6a271ee5ac3d9bcd4f60b20ce8f3b0acf0dfebb9) Change-Id: Ibf885c98b9c05b774716b76d3e6a1d245e31a167
* | | Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-281-25/+2
| | | | | | | | | | | | | | | Bug: 14298175 Change-Id: I68a1cb37166c1e4d68d85a1de7b1b1af8477d5cf
* | | Add TARGET_USERIMAGES_USE_EXT4 to armv7-a-neon.Nicholas Sauer2014-03-241-0/+9
| | | | | | | | | | | | | | | | | | Fix the broken build for PDK. Change-Id: Ib8e790847b3c274288ad3a627acc8c65861a4f6a
* | | am 0efea445: am c1e9a5fe: Merge "Vibra: compile and stage vibrator.default ↵David Turner2014-01-241-0/+1
|\| | | | | | | | | | | | | | | | | | | | to all \'mini\' targets" * commit '0efea4456e5f881bb549fdacb7f4a4ec7a186676': Vibra: compile and stage vibrator.default to all 'mini' targets
| * | am c1e9a5fe: Merge "Vibra: compile and stage vibrator.default to all ↵David Turner2014-01-231-0/+1
| |\| | | | | | | | | | | | | | | | | | | \'mini\' targets" * commit 'c1e9a5fe7a7804e37c3d26449ee703eab4498182': Vibra: compile and stage vibrator.default to all 'mini' targets
| | * Merge "Vibra: compile and stage vibrator.default to all 'mini' targets"David Turner2014-01-241-0/+1
| | |\
| | | * Vibra: compile and stage vibrator.default to all 'mini' targetsDavid Wagner2013-12-311-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the new vibrator module design, the legacy vibrator is absent from 'mini' targets. This patch stages the default implementation of the new vibrator module to these targets. This change is related to other changes in: - hardware/libhardware - hardware/libhardware_legacy - frameworks/base - device/generic/goldfish - platform/build Change-Id: I844279f5535289f079d412fdc44c5cb3c9c1130c Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Signed-off-by: David Wagner <david.wagner@intel.com> Author-tracking-BZ: 94611
* | | am 4a17bf42: am 88caebac: Merge commit ↵The Android Open Source Project2013-12-060-0/+0
|\| | | | | | | | | | | | | | | | | \'0923313d90f03365d3fb881c3cb6d50802946b6b\' into HEAD * commit '4a17bf42a27c388708861423cac39d0bf09433f0':
| * | am 88caebac: Merge commit \'0923313d90f03365d3fb881c3cb6d50802946b6b\' into HEADThe Android Open Source Project2013-12-050-0/+0
| |\| | | | | | | | | | * commit '88caebac272fb3b06b1c8eb0730287cb541bcfc1':
| | * Merge commit '0923313d90f03365d3fb881c3cb6d50802946b6b' into HEADThe Android Open Source Project2013-12-051-0/+1
| | |\
* | | | am 610cf57b: am 2cccd9a2: Merge "We don\'t need WPA_SUPPLICANT_VERSION in ↵Ying Wang2013-12-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | generic build." * commit '610cf57b2c27919accba8ee9ce99001dcceab886': We don't need WPA_SUPPLICANT_VERSION in generic build.
| * | | am 2cccd9a2: Merge "We don\'t need WPA_SUPPLICANT_VERSION in generic build."Ying Wang2013-12-051-2/+0
| |\| | | | |/ | |/| | | | | | | * commit '2cccd9a25ebbccf4cdd5c52593f0d518b6c9a9b4': We don't need WPA_SUPPLICANT_VERSION in generic build.
| | * Merge "We don't need WPA_SUPPLICANT_VERSION in generic build."Ying Wang2013-12-051-2/+0
| | |\
| | | * We don't need WPA_SUPPLICANT_VERSION in generic build.Ying Wang2013-12-051-2/+0
| | |/ | | | | | | | | | Change-Id: Ia303cbb282c904280b77663a142de31c14a2a29d
* | / We don't need WPA_SUPPLICANT_VERSION in generic build.Ying Wang2013-11-251-2/+0
|/ / | | | | | | Change-Id: Ia303cbb282c904280b77663a142de31c14a2a29d
* / Adding Teleservice to PDKStuart Scott2013-11-041-0/+1
|/ | | | | | bug: 11317208,11352958 Change-Id: I49533a7eb67327ab19463c309794af6d680e79b3
* Changing mini to inherit from core_base.mk.Stuart Scott2013-08-021-1/+91
| | | | | | bug: 8503391 Change-Id: Ia71666cdf21661100c8948c2f91b34b512ad958b
* add mini_common for putting common mini stuffskeunyoung2013-06-262-2/+18
| | | | | | - will refactor mini configuration Change-Id: I56cd31c51d1fc5e216baa23c6a600421aa05bb44
* add missing inheritance from chromium.mkkeunyoung2013-06-251-0/+1
| | | | Change-Id: Idafca0934b48b4152a8cdce573ab28194d3e6a68
* am fe9703f3: Merge "Remove unused generic/armv7-a-neon ↵Elliott Hughes2013-03-221-1/+0
|\ | | | | | | | | | | | | ARCH_ARM_HAVE_TLS_REGISTER." * commit 'fe9703f313bd25e72ee6e760813f1094ce31c8a7': Remove unused generic/armv7-a-neon ARCH_ARM_HAVE_TLS_REGISTER.
| * Merge "Remove unused generic/armv7-a-neon ARCH_ARM_HAVE_TLS_REGISTER."Elliott Hughes2013-03-221-1/+0
| |\
| | * Remove unused generic/armv7-a-neon ARCH_ARM_HAVE_TLS_REGISTER.Elliott Hughes2013-03-211-1/+0
| |/ | | | | | | Change-Id: I84b1d43acf220b7adedb36bf98c9fd82d86abd7a
* | am 93559b81: Merge "add TARGET_CPU_VARIANT to PDK ARM target"Christopher Ferris2013-03-070-0/+0
|\| | | | | | | | | * commit '93559b817cd0966743b41958f7bc46919d724143': add TARGET_CPU_VARIANT to PDK ARM target
| * Merge "add TARGET_CPU_VARIANT to PDK ARM target"Christopher Ferris2013-03-081-0/+1
| |\
| | * add TARGET_CPU_VARIANT to PDK ARM targetkeunyoung2013-03-071-0/+1
| |/ | | | | | | Change-Id: I6d458e49671f36cb368a784156b8ccf09074bab4
* / add TARGET_CPU_VARIANT to PDK ARM targetkeunyoung2013-03-051-0/+1
|/ | | | | | - fix build Change-Id: I0af2d9961445b34b2ef2a5f38014ed20f9602f7f
* disable lockscreen by defaultcm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1Keun young Park2012-08-221-0/+22
| | | | | | - As dummy android.policy will not support lock screen properly Change-Id: I6d002f302a243ff376feca345ba79c93d2457e31
* define BOARD_USE_LEGACY_UI for PDK buildKeun young Park2012-08-221-0/+2
| | | | | | | - coresponding Android.mk will be changed later to use legacy UI when this is set true. Change-Id: I38da6bc20a5ceabf652ceeefb56ddd52b352d1ed
* Add support for per device bluetooth configuration.Wink Saville2012-08-201-0/+1
| | | | | Bug: 6837125 Change-Id: I1d1253c47361d91023e242fea19abc3f7fe5fa0e
* enable OPENGL_RENDERER by defaultKeun young Park2012-08-141-0/+2
| | | | | | | | - Some JNI under frameworks/base should be built to support this to support this feature in PDK fusion build Bug: 6985535 Change-Id: I1535e0732d69da8bf690e2858b7dee5cdb7a9890
* Merge "Fix build - Add TARGET_ARCH := arm"Jean-Baptiste Queru2012-08-101-0/+1
|\
| * Fix build - Add TARGET_ARCH := armJean-Baptiste Queru2012-08-101-0/+1
|/ | | | Change-Id: I060f57e76e0fe7c048b7968e43525b510bb4e13d
* fix PDK build: use WPA_SUPPLICANT v8 instead of v6jellybean-stablejellybeanKeun young Park2012-06-111-0/+2
| | | | | | - v6 is not included in PDK Change-Id: Ia020b01aadd5e68cf1c620de69f8f8f503425eae
* mini_armv7a_neon configuration for PDKKeun young Park2012-06-066-0/+154
| | | | | | Bug: 6540216 Change-Id: I3d6c6d44382aba907a483036072bfe4df875f70a
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 16:19:01 +0000