OSDN Git Service
Matthew Bouyack [Tue, 18 Oct 2016 17:16:22 +0000 (17:16 +0000)]
In SurfaceFlinger, test fence before merging
am:
377c203375
Change-Id: Icfbcbe58de9f6930f06774f47e6576ec523115bd
Dan Stoza [Tue, 18 Oct 2016 17:16:12 +0000 (17:16 +0000)]
libui: Change hasSignaled to return optional<bool>
am:
6db42ac36e
Change-Id: I9b845b9f8c0e752733cca4ee50b2f92573e96a28
Nick Vaccaro [Tue, 18 Oct 2016 17:16:00 +0000 (17:16 +0000)]
Sensors: Add WRIST_TILT_GESTURE as wake sensor
am:
5e7f79bf29
Change-Id: Iffcd4b96d1156d314b42e89f8114b9b1de48d258
Nick Vaccaro [Mon, 17 Oct 2016 22:40:51 +0000 (15:40 -0700)]
Sensors: Add WRIST_TILT_GESTURE as wake sensor
Include WRIST_TILT_GESTURE sensor type when determining if
a sensor is a wake sensor or not in getDefaultSensor().
Change-Id: Ib9ae3990e063848163edd34be2ec021ed518e346
Matthew Bouyack [Fri, 7 Oct 2016 22:06:15 +0000 (15:06 -0700)]
In SurfaceFlinger, test fence before merging
If the old fence for a given layer has already expired, we can replace
it with the new fence rather than merging the two.
This saves 300-400us per frame on Android Wear
Change-Id: I5d907c336c7383ae4e2e0f71e42f23749494a359
Dan Stoza [Thu, 13 Oct 2016 16:45:00 +0000 (09:45 -0700)]
libui: Change hasSignaled to return optional<bool>
Since the android::Fence::wait() call can possibly return an error,
we need some way of indicating to the caller of hasSignaled that a
fence that has not yet signaled (because it is in an error state) will
never signal. To do this, we return an optional<bool>, where true and
false indicate both that the fence is valid and that it has or hasn't
signaled. If an error is returned from wait(), we return a default
optional value (that is neither true nor false).
Test: m
Change-Id: Ibce48cd2e71ddb8ccf6cabe3284afe0efca8c132
Ashutosh Joshi [Mon, 17 Oct 2016 17:31:03 +0000 (17:31 +0000)]
Merge "Add a feature to signal fitness quality heart rate monitors" into cw-f-dev
am:
0590c6d766
Change-Id: Ib3a0588a70f52ed7b8fb295d326086598d47bdc6
Ashutosh Joshi [Mon, 17 Oct 2016 17:31:02 +0000 (17:31 +0000)]
Add a feature to signal fitness quality heart rate monitors
am:
8aacbc3127
Change-Id: Ic40f7583a9326393a4e6114a9e4a1c0909b15587
Ashutosh Joshi [Mon, 17 Oct 2016 17:20:35 +0000 (17:20 +0000)]
Merge "Add a feature to signal fitness quality heart rate monitors" into cw-f-dev
Dan Willemsen [Sat, 15 Oct 2016 02:27:37 +0000 (02:27 +0000)]
Merge "Remove ASAN specialization" am:
0723ad3969
am:
01d6334398
Change-Id: I17ad31f5cc0fcca510c56bbabd63c32cbc448698
Dan Willemsen [Sat, 15 Oct 2016 02:23:06 +0000 (02:23 +0000)]
Merge "Remove ASAN specialization"
am:
0723ad3969
Change-Id: I05bca0d1e4c1709565a05f1997a883c173279a53
Treehugger Robot [Sat, 15 Oct 2016 02:17:24 +0000 (02:17 +0000)]
Merge "Remove ASAN specialization"
Dan Willemsen [Tue, 11 Oct 2016 22:59:04 +0000 (15:59 -0700)]
Remove ASAN specialization
The linker will rewrite library paths when running with asan, there's no
reason to do this manually:
10-11 23:26:33.971 8789 8789 E linker : linker_asan dlopen translating "/system/lib64/libEGL.so" -> "/data/lib64/libEGL.so"
10-11 23:26:34.061 8790 8790 E linker : linker_asan dlopen translating "/system/lib/libEGL.so" -> "/data/lib/libEGL.so"
Test: Boot SANITIZE_TARGET=address aosp_flounder-eng
Change-Id: I3eb9935603b267c2aefe09d4f24410cbd673feb6
Ashutosh Joshi [Thu, 6 Oct 2016 20:04:35 +0000 (13:04 -0700)]
Add a feature to signal fitness quality heart rate monitors
Adding a feature to signal the presence of a fitness quality heart
rate monitor on the device.
Change-Id: Iaf5f6a2dc1c76e7f4ce40612588c368bcfc0d29d
Dan Willemsen [Fri, 14 Oct 2016 20:38:00 +0000 (20:38 +0000)]
Merge "Hardcode EGL Cache size to something more reasonable" am:
8a767feb14
am:
e932226e8d
Change-Id: Idd3ed3f98a486b761b188784c4478aefe9d03662
Dan Willemsen [Fri, 14 Oct 2016 20:34:31 +0000 (20:34 +0000)]
Merge "Hardcode EGL Cache size to something more reasonable"
am:
8a767feb14
Change-Id: I08a68da026d9a0f36572059a7db1c5e99b988f8e
Treehugger Robot [Fri, 14 Oct 2016 19:26:15 +0000 (19:26 +0000)]
Merge "Hardcode EGL Cache size to something more reasonable"
Dan Willemsen [Tue, 11 Oct 2016 22:42:59 +0000 (15:42 -0700)]
Hardcode EGL Cache size to something more reasonable
Most of our devices are setting much larger values here than the
default, so instead of hoping every device sets the larger values, just
hardcode the cache size to the larger values.
This also reduces build-time configuration, so we can share the built
library between more devices.
Test: /data/nativetest*/EGL_test/EGL_test on aosp_flounder-eng
Change-Id: Id9b80cecff837cc35043ad3c3cf1d1c60595c237
Dan Willemsen [Thu, 13 Oct 2016 23:24:29 +0000 (23:24 +0000)]
Merge "Remove EGL Hibernation" am:
5e86147abc am:
eccef21647
am:
b814df602f -s ours
Change-Id: Ia78ea687494c2125f68ba85a76bfa02c4c1f5c34
Dan Willemsen [Thu, 13 Oct 2016 23:18:16 +0000 (23:18 +0000)]
Merge "Remove EGL Hibernation" am:
5e86147abc
am:
eccef21647
Change-Id: Iffa69ccfeb0b80fab8d5e92873099413f7c2b560
Dan Willemsen [Thu, 13 Oct 2016 23:15:46 +0000 (23:15 +0000)]
Merge "Remove EGL Hibernation"
am:
5e86147abc
Change-Id: I7afcd579a1ba81733540b280186bb7e3644b1816
Treehugger Robot [Thu, 13 Oct 2016 23:08:57 +0000 (23:08 +0000)]
Merge "Remove EGL Hibernation"
Dan Willemsen [Tue, 11 Oct 2016 19:46:38 +0000 (12:46 -0700)]
Remove EGL Hibernation
Test: Booted aosp_flounder-eng
Merged-In: I0068bbd0a274bd0db237c30d958ea75b6d8aaf11
Change-Id: I0068bbd0a274bd0db237c30d958ea75b6d8aaf11
TreeHugger Robot [Thu, 13 Oct 2016 18:09:05 +0000 (18:09 +0000)]
Merge "Remove EGL Hibernation" into nyc-mr1-dev-plus-aosp
Dan Stoza [Thu, 13 Oct 2016 16:21:26 +0000 (16:21 +0000)]
libui: Add hasSignaled() method to Fence
am:
5736f7dc15
Change-Id: I14519e0db9d203d88655906b84e5bac7310ca2df
Dan Willemsen [Tue, 11 Oct 2016 19:46:38 +0000 (12:46 -0700)]
Remove EGL Hibernation
Test: Booted aosp_flounder-eng
Change-Id: I0068bbd0a274bd0db237c30d958ea75b6d8aaf11
Wei Wang [Wed, 12 Oct 2016 20:57:02 +0000 (20:57 +0000)]
Merge "Move atrace init into on fs trigger" am:
8fee401726 am:
23c7fe7195
am:
7247edd7ad
Change-Id: I6a987ded104c4237b2a373e2686b2c2d1232d2ed
Wei Wang [Wed, 12 Oct 2016 20:56:50 +0000 (20:56 +0000)]
Move atrace init into on fs trigger am:
23d0302561 am:
53389b089c
am:
6a67872673
Change-Id: I9b0a0469d6308ef9ff6db68191d39644ec5f3382
Wei Wang [Wed, 12 Oct 2016 20:50:16 +0000 (20:50 +0000)]
Merge "Move atrace init into on fs trigger" am:
8fee401726
am:
23c7fe7195
Change-Id: I6f5871db3c55845f1eba18e5a7ab2be57332ce22
Wei Wang [Wed, 12 Oct 2016 20:50:05 +0000 (20:50 +0000)]
Move atrace init into on fs trigger am:
23d0302561
am:
53389b089c
Change-Id: Id29974c68fbe8225b24182dd7e8e910e1921b44a
Wei Wang [Wed, 12 Oct 2016 20:43:00 +0000 (20:43 +0000)]
Merge "Move atrace init into on fs trigger"
am:
8fee401726
Change-Id: I6541f1f27aeaa056ec3f5a24327d7fd051157023
Wei Wang [Wed, 12 Oct 2016 20:42:58 +0000 (20:42 +0000)]
Move atrace init into on fs trigger
am:
23d0302561
Change-Id: I91ef42cb258552d75115632ce5d2df509e2cf35d
Wei Wang [Wed, 12 Oct 2016 20:36:43 +0000 (20:36 +0000)]
Merge "Move atrace init into on fs trigger"
Dan Stoza [Wed, 12 Oct 2016 17:35:17 +0000 (10:35 -0700)]
libui: Add hasSignaled() method to Fence
Adds a hasSignaled() method to android::Fence. This will make it easier
to write client code that only cares whether a fence has signaled, and
allows such code to gain the performance benefits of wait(0) (which is
significantly faster than getSignalTime()) while still being obvious
about what it is trying to do.
Test: m
Change-Id: Ia28ce6cff3860a171254ea20a24f3f1bfbc67eb8
Wei Wang [Tue, 11 Oct 2016 22:26:06 +0000 (15:26 -0700)]
Move atrace init into on fs trigger
sysfs should be ready on ealier stage than boot
Bug:
32025203
Test: take systrace
Change-Id: Id73b6959f3075dc793d93551963193a211060da8
Wei Wang [Wed, 12 Oct 2016 01:11:50 +0000 (01:11 +0000)]
Move atrace init into on fs trigger am:
f920891b71
am:
dc34164cef
Change-Id: I30a5063ae24b21f38945b581d1bfbe67390667f6
Wei Wang [Wed, 12 Oct 2016 01:06:17 +0000 (01:06 +0000)]
Move atrace init into on fs trigger
am:
f920891b71
Change-Id: If6deb43479999924cfce63ca6b3994f9f7276c39
Elliott Hughes [Wed, 12 Oct 2016 00:55:06 +0000 (00:55 +0000)]
Merge "Rely on the platform -std default." am:
26989871a5 am:
35368f2475
am:
274347ebf1
Change-Id: Idce8ffa834e8ae8298d3ab8f516b4f4f31b02f18
Elliott Hughes [Wed, 12 Oct 2016 00:48:50 +0000 (00:48 +0000)]
Merge "Rely on the platform -std default." am:
26989871a5
am:
35368f2475
Change-Id: I1dffb52b3f59a8fe42c4c42e10ff7c9287e81e63
Elliott Hughes [Wed, 12 Oct 2016 00:42:19 +0000 (00:42 +0000)]
Merge "Rely on the platform -std default."
am:
26989871a5
Change-Id: I1acbc09058a339d0df076e0fccb750bb57099e8d
Treehugger Robot [Wed, 12 Oct 2016 00:32:21 +0000 (00:32 +0000)]
Merge "Rely on the platform -std default."
Wei Wang [Tue, 11 Oct 2016 22:26:06 +0000 (15:26 -0700)]
Move atrace init into on fs trigger
sysfs should be ready on ealier stage than boot
Bug:
32025203
Test: take systrace
Change-Id: Id73b6959f3075dc793d93551963193a211060da8
Elliott Hughes [Tue, 11 Oct 2016 21:47:19 +0000 (14:47 -0700)]
Rely on the platform -std default.
Bug: http://b/
32019064
Test: builds
Change-Id: I88ea6b959b9d855a536e1475ed437105370203d0
Elliott Hughes [Mon, 10 Oct 2016 22:33:21 +0000 (22:33 +0000)]
Merge "Rely on the platform -std default." am:
53b6fc5ddc am:
0ef01bab39
am:
b48bc88b75
Change-Id: I948f14c73030d6d0f0cae8b9e374962ad119f7f6
Elliott Hughes [Mon, 10 Oct 2016 22:00:57 +0000 (22:00 +0000)]
Merge "Rely on the platform -std default." am:
53b6fc5ddc
am:
0ef01bab39
Change-Id: I11137b0f1327691fa88acee67d9270fe509aa353
Elliott Hughes [Mon, 10 Oct 2016 21:46:02 +0000 (21:46 +0000)]
Merge "Rely on the platform -std default."
am:
53b6fc5ddc
Change-Id: Ie70a8414a18c0f8b8bb4054545bc7dc74c99838c
Treehugger Robot [Mon, 10 Oct 2016 21:19:54 +0000 (21:19 +0000)]
Merge "Rely on the platform -std default."
Matthew Bouyack [Mon, 10 Oct 2016 18:11:34 +0000 (18:11 +0000)]
Merge "Use snprintf for SurfaceFlinger fence name" into cw-f-dev
am:
f35d95673e
Change-Id: I014bbfa36ee2f660309d8bb10e6be989189e6de1
Matthew Bouyack [Mon, 10 Oct 2016 18:11:30 +0000 (18:11 +0000)]
Use snprintf for SurfaceFlinger fence name
am:
fd4c8c3805
Change-Id: I16d3eb7cde318f2078be36acea22b9bc84975b63
Matthew Bouyack [Mon, 10 Oct 2016 18:03:37 +0000 (18:03 +0000)]
Merge "Use snprintf for SurfaceFlinger fence name" into cw-f-dev
Matthew Bouyack [Fri, 7 Oct 2016 21:26:47 +0000 (14:26 -0700)]
Use snprintf for SurfaceFlinger fence name
snprintf is significantly faster than String8::format
This change saves ~50us per frame on Android Wear
Change-Id: I6ac47c2434662ca561208daae232f02a9f136aaf
Elliott Hughes [Fri, 7 Oct 2016 22:46:42 +0000 (15:46 -0700)]
Rely on the platform -std default.
Bug: http://b/
32019064
Test: builds
Change-Id: Ie2df259641889b3ce95648bd2be48d061108162c
Matthew Bouyack [Fri, 7 Oct 2016 16:54:57 +0000 (16:54 +0000)]
Merge "Eliminate unnecessary calls to onBufferReleased" into cw-f-dev
am:
76456aa438
Change-Id: I9ee9b9146397c46b98c9bf736a10b0e343c4e836
Matthew Bouyack [Thu, 6 Oct 2016 22:36:56 +0000 (15:36 -0700)]
resolve merge conflicts of
3b8e6b2 to nyc-mr1-dev-plus-aosp
Change-Id: I9c02a56d63de5828453aa8926ca801d96b04a6cf
Matthew Bouyack [Thu, 6 Oct 2016 21:27:20 +0000 (21:27 +0000)]
Merge "Eliminate unnecessary calls to onBufferReleased" into cw-f-dev
Wei Liu [Thu, 6 Oct 2016 21:25:23 +0000 (21:25 +0000)]
Dumpstate should hold a wakelock to save bug report time. DO NOT MERGE. am:
2cc37eaaa7
am:
079abd98af
Change-Id: I36189431935344400deea32596c030dae8b4a82b
Wei Liu [Thu, 6 Oct 2016 19:54:04 +0000 (19:54 +0000)]
Dumpstate should hold a wakelock to save bug report time. DO NOT MERGE.
am:
2cc37eaaa7
Change-Id: Ic58338aaf3dd67b9256e42fe4d61416b35c367de
Dan Albert [Thu, 6 Oct 2016 19:27:13 +0000 (19:27 +0000)]
Merge "Migrate libvulkan to ndk_library." am:
02affcd552 am:
425ae4a06a
am:
38bfdb02db
Change-Id: Ib499b72acfc947cd27e084c2cdc7c6b52b1ea07e
Dan Albert [Thu, 6 Oct 2016 19:23:43 +0000 (19:23 +0000)]
Merge "Migrate libvulkan to ndk_library." am:
02affcd552
am:
425ae4a06a
Change-Id: Ie771d411939c583dd30dd1b753d9dfdf28f2fd74
Dan Albert [Thu, 6 Oct 2016 19:20:13 +0000 (19:20 +0000)]
Merge "Migrate libvulkan to ndk_library."
am:
02affcd552
Change-Id: I97d6f3e7ce8058c190ac38ad9214794ccea6def3
Treehugger Robot [Thu, 6 Oct 2016 19:14:10 +0000 (19:14 +0000)]
Merge "Migrate libvulkan to ndk_library."
Dan Albert [Wed, 5 Oct 2016 00:49:33 +0000 (17:49 -0700)]
Migrate libvulkan to ndk_library.
Test: make native
Bug: http://b/
30465923
Change-Id: I97199a600b71447fd14181e06be3f9221c2529f3
Colin Cross [Fri, 30 Sep 2016 23:32:19 +0000 (16:32 -0700)]
Fix constructor parameters shadowing member variables
Using the same name for the constructor parameter and the member
variable causes a warning that was being hidden by the use of -isystem
to include frameworks/native/include. Prefix the parameter with an
underscore.
Bug:
31752268
Test: m -j
Change-Id: I60c7dc388999bafbb97cb42f5e0af5361df68d56
(cherry picked from commit
0ed088bd90c4e9ae5a92047319c3932b2aa78ddf)
Dan Albert [Wed, 5 Oct 2016 23:20:59 +0000 (23:20 +0000)]
Merge "Migrate khrplatform.h to ndk_headers." am:
a0d616be74 am:
fea2cbbe39
am:
939621c380
Change-Id: Ic06b577feeac9a6419b03644cd529886e0330978
Dan Albert [Wed, 5 Oct 2016 23:18:28 +0000 (23:18 +0000)]
Merge "Migrate khrplatform.h to ndk_headers." am:
a0d616be74
am:
fea2cbbe39
Change-Id: If4cfe4aa468e50dd12c8f0c66bdfdbca8e0bf8f5
Dan Albert [Wed, 5 Oct 2016 23:15:59 +0000 (23:15 +0000)]
Merge "Migrate khrplatform.h to ndk_headers."
am:
a0d616be74
Change-Id: I659219ee179aac1d43e74dcdecde46c073c89436
Treehugger Robot [Wed, 5 Oct 2016 23:11:53 +0000 (23:11 +0000)]
Merge "Migrate khrplatform.h to ndk_headers."
Dan Albert [Wed, 5 Oct 2016 00:49:33 +0000 (17:49 -0700)]
Migrate khrplatform.h to ndk_headers.
Test: make native
Bug: http://b/
30465923
Change-Id: Idaf0eb973b7569f92b1f1575869d13b8c5e706fd
Dan Albert [Wed, 5 Oct 2016 20:42:50 +0000 (20:42 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef am:
900da7b14a am:
93c91c81fd
am:
75a118f9d1
Change-Id: Icc233e4c2b64497741b75502dc51497a23a1c51f
Dan Albert [Wed, 5 Oct 2016 20:42:41 +0000 (20:42 +0000)]
Migrate libGLESv3 to ndk_library. am:
d7d8efa471 am:
0238c63510
am:
61b9688387
Change-Id: I794fc4359c6eb0601dd765867ad1c42990351687
Dan Albert [Wed, 5 Oct 2016 20:42:30 +0000 (20:42 +0000)]
Migrate libGLESv2 to ndk_library. am:
00500c798a am:
2cdf177bc1
am:
6e8eeea98f
Change-Id: Ic208e02635970134d5911fdbbc422aaeef553a9b
Dan Albert [Wed, 5 Oct 2016 20:42:19 +0000 (20:42 +0000)]
Migrate libGLESv1_CM to ndk_library. am:
7facb1db6e am:
ebe4ea9e88
am:
ff88cbd859
Change-Id: Ibbfd1136fb1d53f83204e697c5c233d73b3a7bb8
Dan Albert [Wed, 5 Oct 2016 20:40:19 +0000 (20:40 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef am:
900da7b14a
am:
93c91c81fd
Change-Id: I4f4c9b668d019d8eae010b41755c8985b9c76b17
Dan Albert [Wed, 5 Oct 2016 20:40:09 +0000 (20:40 +0000)]
Migrate libGLESv3 to ndk_library. am:
d7d8efa471
am:
0238c63510
Change-Id: Ie8a699ed04e115de621f4b2d5ac5b904d39006bd
Dan Albert [Wed, 5 Oct 2016 20:39:59 +0000 (20:39 +0000)]
Migrate libGLESv2 to ndk_library. am:
00500c798a
am:
2cdf177bc1
Change-Id: Iff08c160dbe9f974672672ca453303aaac5487bc
Dan Albert [Wed, 5 Oct 2016 20:39:49 +0000 (20:39 +0000)]
Migrate libGLESv1_CM to ndk_library. am:
7facb1db6e
am:
ebe4ea9e88
Change-Id: I6639fc184bf99095a3bcb3d8b0e77d6a24d5b3b6
Dan Albert [Wed, 5 Oct 2016 20:37:09 +0000 (20:37 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef
am:
900da7b14a
Change-Id: I8d50ffcdaff60b51a81c0648a0087d645e99ee1d
Dan Albert [Wed, 5 Oct 2016 20:37:08 +0000 (20:37 +0000)]
Migrate libGLESv3 to ndk_library.
am:
d7d8efa471
Change-Id: I86f06ebcaa1e2dd860d61ff9cd9b5503158735ba
Dan Albert [Wed, 5 Oct 2016 20:36:58 +0000 (20:36 +0000)]
Migrate libGLESv2 to ndk_library.
am:
00500c798a
Change-Id: I3031e4a938bbfbd97b51735707bf5fe0bc884b37
Dan Albert [Wed, 5 Oct 2016 20:36:49 +0000 (20:36 +0000)]
Migrate libGLESv1_CM to ndk_library.
am:
7facb1db6e
Change-Id: I777d5d8b08ff11491aabdb4166d7c0d38b09f20c
Treehugger Robot [Wed, 5 Oct 2016 20:31:38 +0000 (20:31 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef
* changes:
Migrate libGLESv3 to ndk_library.
Migrate libGLESv2 to ndk_library.
Migrate libGLESv1_CM to ndk_library.
Colin Cross [Wed, 5 Oct 2016 19:02:12 +0000 (19:02 +0000)]
Merge "Fix anonymous struct and union warnings" am:
87e72cb237 am:
a3ac6c2b86
am:
86eff80c19
Change-Id: I6358d387eebddcd9238f250db7429f5846a2260a
Colin Cross [Wed, 5 Oct 2016 18:59:41 +0000 (18:59 +0000)]
Merge "Fix anonymous struct and union warnings" am:
87e72cb237
am:
a3ac6c2b86
Change-Id: Iecd9d1b0b6a22d48a1cac59e028f7d31b50a3e3e
Colin Cross [Wed, 5 Oct 2016 18:56:41 +0000 (18:56 +0000)]
Merge "Fix anonymous struct and union warnings"
am:
87e72cb237
Change-Id: I1ace0ad7d2f175b6d6cc42a0ce6845c76ba032b3
Treehugger Robot [Wed, 5 Oct 2016 18:52:25 +0000 (18:52 +0000)]
Merge "Fix anonymous struct and union warnings"
Dan Albert [Wed, 5 Oct 2016 18:35:40 +0000 (18:35 +0000)]
Merge "Migrate libEGL to ndk_library." am:
ce1bc304a2 am:
183edbb062
am:
62d80401f3
Change-Id: Iba58208172ee35efd854d2fd629e40413063f28d
Dan Albert [Wed, 5 Oct 2016 18:33:11 +0000 (18:33 +0000)]
Merge "Migrate libEGL to ndk_library." am:
ce1bc304a2
am:
183edbb062
Change-Id: Iff01a29d4b03a45a5b28a6f98f93eb4af3e00ad7
Dan Albert [Wed, 5 Oct 2016 18:30:40 +0000 (18:30 +0000)]
Merge "Migrate libEGL to ndk_library."
am:
ce1bc304a2
Change-Id: If048759fd60754bd0c7df9c02f33f28a800eaace
Treehugger Robot [Wed, 5 Oct 2016 18:24:16 +0000 (18:24 +0000)]
Merge "Migrate libEGL to ndk_library."
Colin Cross [Sat, 1 Oct 2016 00:24:06 +0000 (17:24 -0700)]
Fix anonymous struct and union warnings
gui/BufferItem.h and android/sensor.h uses anymous structs and nested
anonymous unions, which are GNU extensions. sensor.h uses them as part
of its API, so disable the warnings in libgui, the only module that
tries to use it with -Weverything. BufferItem.h only uses the unioned
fields inside libgui, remove the union and do the 64-bit to 32-bit
slicing manually so libvulkan doesn't need the warnings disabled.
Bug:
31752268
Test: m -j
Change-Id: I92d59b1202f4d6e5419edaa6d27b6e1c50ac0042
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv3 to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I6a2f4df7f409596f487879eb7d43a7774dced894
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv2 to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I62e108bdd27b6dc40fdf7ede7d579a286cbf3b9b
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv1_CM to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: Icd83a5ef5d6afcde9441f49de14a8e645d15da2f
Colin Cross [Tue, 4 Oct 2016 21:23:41 +0000 (21:23 +0000)]
Merge "Rename dump methods to dumpState" am:
c72b9a3ce4 am:
219df2fd5b
am:
bb6d63ad52 -s ours
Change-Id: Id9b5435b3e309206a6a924005be240986bc46663
Colin Cross [Tue, 4 Oct 2016 21:23:07 +0000 (21:23 +0000)]
Merge changes I2ce11db5,Idba8278b am:
dd3f863499 am:
198134666b
am:
d45e51b815 -s ours
Change-Id: I4f7e6dbcd4a1ab14ed0c6e7cb056a6a94175831e
Colin Cross [Tue, 4 Oct 2016 21:22:53 +0000 (21:22 +0000)]
Fix logging implicit sign conversions am:
8bafabf1f6 am:
6b2749643f
am:
33a6d87795 -s ours
Change-Id: Idb41fd375c17ff8125f3149ad7ec4802a76d3d58
Colin Cross [Tue, 4 Oct 2016 21:22:41 +0000 (21:22 +0000)]
Fix libgui warnings am:
6c5a17dd26 am:
972cce4cb9
am:
af06c61e1b
Change-Id: I191c8a14d54427215922427c4bb497bdb7c27dd9
Dan Stoza [Tue, 4 Oct 2016 21:21:37 +0000 (21:21 +0000)]
Merge changes I1c6a271f,I1e41e5f5,Ib2f48895,Ia8af95d2,Ie966e37d, ... am:
2b23374b45 am:
ea8e8a2aa6
am:
9d9e611d89
Change-Id: I4e20874d0096fc4a5bc526821191d8903acac563
Dan Stoza [Tue, 4 Oct 2016 21:21:27 +0000 (21:21 +0000)]
SF: Fix a couple of Layer ref count issues am:
de84eb6b82 am:
1ce7c1d3aa
am:
6ce2ad4310
Change-Id: I1eeff52d56054e0f5b6ee9eaa3b7b9abb99ad106
Dan Stoza [Tue, 4 Oct 2016 21:21:16 +0000 (21:21 +0000)]
Build SF executable with USE_HWC2 when needed am:
f9f7f6931f am:
58719ff766
am:
1802970525
Change-Id: I376f995fbe7c1aca83f9aeafe27fae34d832111e
OSDN Git Service
