summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-01resolved conflicts for merge of 6a9e1f6c to masterandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-preview-2android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1nougat-releasenougat-mr1-wear-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releasen-iot-preview-2marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releasebrillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devbrillo-m7-releasebrillo-m7-mr-devbrillo-m7-devbrillo-m10-releasebrillo-m10-devNick Kralevich
Change-Id: I8b985b27c132bf0808fbe4c0e7a095891e45a97a
2015-04-01Merge "Drop BOARD_SEPOLICY_UNION."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-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>
2014-11-20am 26d680b5: Merge "Remove generic/x86 no-op."Elliott Hughes
* commit '26d680b5edde00120726a05c204e97ddef3d246a': Remove generic/x86 no-op.
2014-11-20Merge "Remove generic/x86 no-op."android-wear-5.0.0_r1lollipop-wear-releaseElliott Hughes
2014-11-20Remove generic/x86 no-op.Elliott Hughes
Change-Id: Idcbcfecdd9dc70523de6e644e68526c391b236aa
2014-10-14Fix broken build.dcashman
Change-Id: I0c26480735e45dc5f8df3c986f2c7aad555f8d24
2014-07-09Delete vendorsetup.sh which is used internally.android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseleozwang
Change-Id: I8235600ad81d212062785103cdc0eb12c6bc8767
2014-07-09x86 should inherit from x86 emulator rulesNick Kralevich
We were only inheriting from the generic emulator rules, not the x86 rules too. This was causing lots of SELinux denials. Bug: 16101432 Change-Id: Ib6f1f01c20c857e0ba97747e6a390281d319e1d6
2014-06-26Consolidate x86 board config and add selinux settings.leozwang
Change-Id: I7af2703712ed35a1c6479cec4d5bd65f8d1a22e7
2014-05-22merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-22merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-21merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-20merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-19merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-18merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-17merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-15merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-14merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-13merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-12merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-11merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-10merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-08merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-07merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-07merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-06merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-05merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-04merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-03merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-05-01merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-04-30merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-04-29merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-04-28merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-04-27merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-04-26merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-04-24merge in master-release history after reset to ↵The Android Automerger
9cba0f12682eadc0d297468fd547847c2f99e4b5
2014-03-28Add TARGET_USERIMAGES_USE_EXT4 to x86 to fix broken pdk buildNicholas Sauer
Change-Id: If01cec346f25527e8431bdc77f15f2454afe318d
2014-03-27Add TARGET_USERIMAGES_USE_EXT4 to x86 to fix broken pdk buildNicholas Sauer
Change-Id: If01cec346f25527e8431bdc77f15f2454afe318d
2013-12-05am f111878f: Merge "We don\'t need WPA_SUPPLICANT_VERSION in generic build."Ying Wang
* commit 'f111878fb41e2bdf4eb092d1edf0eb53cc5d0153': We don't need WPA_SUPPLICANT_VERSION in generic build.
2013-12-05Merge "We don't need WPA_SUPPLICANT_VERSION in generic build."android-l-preview_r2l-previewidea133-weekly-releaseidea133Ying Wang
2013-12-05We don't need WPA_SUPPLICANT_VERSION in generic build.Ying Wang
Change-Id: I8307c8094e03306ddfc2fc36fbb15aff19ba85f5
2013-11-25We don't need WPA_SUPPLICANT_VERSION in generic build.Ying Wang
Change-Id: I8307c8094e03306ddfc2fc36fbb15aff19ba85f5
2013-06-26use mini_common.mk as common baseline for miniandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devkeunyoung
Change-Id: I2fad48a1616892e2791cea1264ec4e94e66aa264
2012-08-23disable lockscreen by defaultandroid-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22.2tools_r22jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devKeun young Park
- As dummy android.policy will not support lock screen properly Change-Id: I56142a1f1542b1a4b0af11a47ae64267c3e10b0c
2012-08-22define BOARD_USE_LEGACY_UI for PDK buildKeun young Park
- coresponding Android.mk will be changed later to use legacy UI when this is set true. Change-Id: I919564d50158b2836d1a2597aafb446485b88cab
2012-08-20Add support for per device bluetooth configuration.Wink Saville
Bug: 6837125 Change-Id: Idceb93d1ded70599e3234a3f7d1a7e5578d7bcad
2012-08-14enable OPENGL_RENDERER by defaultKeun young Park
- Some JNI under frameworks/base should be built to support this to support this feature in PDK fusion build Bug: 6985535 Change-Id: I3308aae81d044c9ec12ff2e0d1babdb6d3a14b27
2012-08-08add mini_x86 configuration for PDKKeun young Park
- For x86 PDK release from jb-mr1 Change-Id: I78ec0d7f54a1afdbe18888ce14e6ec08dfb0f3bf
2012-07-31Initial empty repositoryChad Jones
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 07:16:42 +0000