OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Chih-Wei Huang [Fri, 8 Dec 2017 08:09:37 +0000 (16:09 +0800)]
Merge tag 'android-8.1.0_r1' into oreo-x86
Android 8.1.0 Release 1 (OPM1.171019.011)
Chih-Wei Huang [Wed, 23 Aug 2017 02:17:29 +0000 (10:17 +0800)]
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
Conflicts:
BoardConfig.mk
Yahan Zhou [Wed, 30 Nov 2016 01:59:20 +0000 (01:59 +0000)]
Migrating goldfish/opengl to goldfish-opengl am:
b676b41d81 am:
7492cfbd0e
am:
dac918b4cd
Change-Id: I6df3beae2ab162a89c65f07596468e163a5adc96
Yahan Zhou [Wed, 30 Nov 2016 01:53:49 +0000 (01:53 +0000)]
Migrating goldfish/opengl to goldfish-opengl am:
b676b41d81
am:
7492cfbd0e
Change-Id: Iee359597a44ccb2f73f5ce0a4617dd5d8532d66a
Yahan Zhou [Wed, 30 Nov 2016 01:48:20 +0000 (01:48 +0000)]
Migrating goldfish/opengl to goldfish-opengl
am:
b676b41d81
Change-Id: I2a3c3d7648ad6bbc3b0959f0fa8e314b2e558220
Yahan Zhou [Mon, 27 Jun 2016 22:45:33 +0000 (15:45 -0700)]
Migrating goldfish/opengl to goldfish-opengl
BUG:
32183368
Change-Id: Iff57811c38435968b2d4d2925010a6659925fc0d
(cherry picked from commit
bdb1eef5cc32cef418fc77248e86429c92acdae3)
(cherry picked from commit
8ab3b808f43ec122616f1b61e2e91d9725c77cc2)
(cherry picked from commit
8ff4478d8ad282997025e72f4f89723d73dc485d)
Yahan Zhou [Sat, 22 Oct 2016 01:57:05 +0000 (01:57 +0000)]
Migrating goldfish/opengl to goldfish-opengl am:
8ff4478d8a am:
ce7b6f79db
am:
15ea4f029b
Change-Id: I1b5b9cf1d156bf845cc26fa0c9aad8866450652f
Yahan Zhou [Sat, 22 Oct 2016 01:54:37 +0000 (01:54 +0000)]
Migrating goldfish/opengl to goldfish-opengl am:
8ff4478d8a
am:
ce7b6f79db
Change-Id: I00ab28ad7e62f9c12d18e99ab8841330572b4d8d
Yahan Zhou [Sat, 22 Oct 2016 01:20:32 +0000 (01:20 +0000)]
Migrating goldfish/opengl to goldfish-opengl
am:
8ff4478d8a
Change-Id: If7c04c9a32e342fe5de49a9dc8c26a3d5da912c2
Yahan Zhou [Mon, 27 Jun 2016 22:45:33 +0000 (15:45 -0700)]
Migrating goldfish/opengl to goldfish-opengl
BUG:
32183368
Change-Id: Iff57811c38435968b2d4d2925010a6659925fc0d
(cherry picked from commit
bdb1eef5cc32cef418fc77248e86429c92acdae3)
(cherry picked from commit
8ab3b808f43ec122616f1b61e2e91d9725c77cc2)
Yahan Zhou [Mon, 27 Jun 2016 22:45:33 +0000 (15:45 -0700)]
Migrating goldfish/opengl to goldfish-opengl
Change-Id: Iff57811c38435968b2d4d2925010a6659925fc0d
(cherry picked from commit
bdb1eef5cc32cef418fc77248e86429c92acdae3)
Chih-Wei Huang [Thu, 8 Oct 2015 07:31:09 +0000 (15:31 +0800)]
Merge remote-tracking branch 'x86/lollipop-x86' into marshmallow-x86
Conflicts:
BoardConfig.mk
Chih-Wei Huang [Sun, 26 Jul 2015 11:50:16 +0000 (19:50 +0800)]
Move TARGET_USES_64_BIT_BINDER definition to common
Chih-Wei Huang [Fri, 3 Apr 2015 08:52:06 +0000 (16:52 +0800)]
android_x86: correct the CPU ABI list
Nick Kralevich [Wed, 1 Apr 2015 19:09:34 +0000 (12:09 -0700)]
resolved conflicts for merge of
6a9e1f6c to master
Change-Id: I8b985b27c132bf0808fbe4c0e7a095891e45a97a
Nick Kralevich [Wed, 1 Apr 2015 17:46:19 +0000 (17:46 +0000)]
Merge "Drop BOARD_SEPOLICY_UNION."
Stephen Smalley [Wed, 1 Apr 2015 14:30:08 +0000 (10:30 -0400)]
Drop BOARD_SEPOLICY_UNION.
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>
Chih-Wei Huang [Fri, 26 Dec 2014 10:44:55 +0000 (18:44 +0800)]
android_x86: force 64-bit binder if 64-bit kernel is chosen
Elliott Hughes [Thu, 20 Nov 2014 23:09:43 +0000 (23:09 +0000)]
am
26d680b5: Merge "Remove generic/x86 no-op."
* commit '
26d680b5edde00120726a05c204e97ddef3d246a':
Remove generic/x86 no-op.
Elliott Hughes [Thu, 20 Nov 2014 21:38:11 +0000 (21:38 +0000)]
Merge "Remove generic/x86 no-op."
Elliott Hughes [Thu, 20 Nov 2014 21:13:57 +0000 (13:13 -0800)]
Remove generic/x86 no-op.
Change-Id: Idcbcfecdd9dc70523de6e644e68526c391b236aa
Chih-Wei Huang [Wed, 5 Nov 2014 03:59:20 +0000 (11:59 +0800)]
android_x86: lollipop-x86 porting
Based on android-5.0.0_r2.
dcashman [Wed, 15 Oct 2014 00:21:23 +0000 (17:21 -0700)]
Fix broken build.
Change-Id: I0c26480735e45dc5f8df3c986f2c7aad555f8d24
leozwang [Wed, 9 Jul 2014 18:10:47 +0000 (11:10 -0700)]
Delete vendorsetup.sh which is used internally.
Change-Id: I8235600ad81d212062785103cdc0eb12c6bc8767
Nick Kralevich [Wed, 9 Jul 2014 17:22:23 +0000 (10:22 -0700)]
x86 should inherit from x86 emulator rules
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
leozwang [Thu, 26 Jun 2014 17:33:50 +0000 (10:33 -0700)]
Consolidate x86 board config and add selinux settings.
Change-Id: I7af2703712ed35a1c6479cec4d5bd65f8d1a22e7
The Android Automerger [Thu, 22 May 2014 14:21:14 +0000 (07:21 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Thu, 22 May 2014 12:49:05 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Wed, 21 May 2014 12:49:04 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Tue, 20 May 2014 12:49:05 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Mon, 19 May 2014 12:49:04 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Sun, 18 May 2014 12:49:04 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Sat, 17 May 2014 12:49:06 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Thu, 15 May 2014 12:49:06 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Wed, 14 May 2014 12:49:10 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Tue, 13 May 2014 12:49:07 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Mon, 12 May 2014 12:49:05 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Sun, 11 May 2014 12:49:05 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Sat, 10 May 2014 12:49:05 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Thu, 8 May 2014 12:49:04 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Wed, 7 May 2014 16:10:05 +0000 (09:10 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Wed, 7 May 2014 12:49:05 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Tue, 6 May 2014 12:49:05 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Mon, 5 May 2014 12:49:07 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Sun, 4 May 2014 12:49:05 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Sat, 3 May 2014 12:49:06 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Thu, 1 May 2014 12:49:05 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Wed, 30 Apr 2014 12:49:07 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Tue, 29 Apr 2014 12:49:09 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Mon, 28 Apr 2014 12:49:05 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Sun, 27 Apr 2014 12:49:04 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Sat, 26 Apr 2014 12:49:09 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
The Android Automerger [Thu, 24 Apr 2014 12:49:08 +0000 (05:49 -0700)]
merge in master-release history after reset to
9cba0f12682eadc0d297468fd547847c2f99e4b5
Nicholas Sauer [Thu, 27 Mar 2014 22:27:08 +0000 (15:27 -0700)]
Add TARGET_USERIMAGES_USE_EXT4 to x86 to fix broken pdk build
Change-Id: If01cec346f25527e8431bdc77f15f2454afe318d
Nicholas Sauer [Thu, 27 Mar 2014 22:27:08 +0000 (15:27 -0700)]
Add TARGET_USERIMAGES_USE_EXT4 to x86 to fix broken pdk build
Change-Id: If01cec346f25527e8431bdc77f15f2454afe318d
Ying Wang [Thu, 5 Dec 2013 21:16:57 +0000 (21:16 +0000)]
am
f111878f: Merge "We don\'t need WPA_SUPPLICANT_VERSION in generic build."
* commit '
f111878fb41e2bdf4eb092d1edf0eb53cc5d0153':
We don't need WPA_SUPPLICANT_VERSION in generic build.
Ying Wang [Thu, 5 Dec 2013 19:14:31 +0000 (19:14 +0000)]
Merge "We don't need WPA_SUPPLICANT_VERSION in generic build."
Ying Wang [Mon, 25 Nov 2013 22:15:01 +0000 (14:15 -0800)]
We don't need WPA_SUPPLICANT_VERSION in generic build.
Change-Id: I8307c8094e03306ddfc2fc36fbb15aff19ba85f5
Ying Wang [Mon, 25 Nov 2013 22:15:01 +0000 (14:15 -0800)]
We don't need WPA_SUPPLICANT_VERSION in generic build.
Change-Id: I8307c8094e03306ddfc2fc36fbb15aff19ba85f5
keunyoung [Wed, 26 Jun 2013 16:58:40 +0000 (09:58 -0700)]
use mini_common.mk as common baseline for mini
Change-Id: I2fad48a1616892e2791cea1264ec4e94e66aa264
Keun young Park [Thu, 23 Aug 2012 18:07:59 +0000 (11:07 -0700)]
disable lockscreen by default
- As dummy android.policy will not support lock screen properly
Change-Id: I56142a1f1542b1a4b0af11a47ae64267c3e10b0c
Keun young Park [Wed, 22 Aug 2012 20:53:54 +0000 (13:53 -0700)]
define BOARD_USE_LEGACY_UI for PDK build
- coresponding Android.mk will be changed later to use legacy UI when
this is set true.
Change-Id: I919564d50158b2836d1a2597aafb446485b88cab
Wink Saville [Mon, 20 Aug 2012 16:47:03 +0000 (09:47 -0700)]
Add support for per device bluetooth configuration.
Bug:
6837125
Change-Id: Idceb93d1ded70599e3234a3f7d1a7e5578d7bcad
Keun young Park [Tue, 14 Aug 2012 23:50:50 +0000 (16:50 -0700)]
enable OPENGL_RENDERER by default
- Some JNI under frameworks/base should be built to support this to
support this feature in PDK fusion build
Bug:
6985535
Change-Id: I3308aae81d044c9ec12ff2e0d1babdb6d3a14b27
Keun young Park [Wed, 8 Aug 2012 19:51:00 +0000 (12:51 -0700)]
add mini_x86 configuration for PDK
- For x86 PDK release from jb-mr1
Change-Id: I78ec0d7f54a1afdbe18888ce14e6ec08dfb0f3bf
Chad Jones [Tue, 31 Jul 2012 23:25:59 +0000 (16:25 -0700)]
Initial empty repository