Commit Graph

19109 Commits

Author SHA1 Message Date
Christopher Ferris
2473cabd0d Merge "Fix up the makefiles and some samples." 2016-04-20 19:09:00 +00:00
Christopher Ferris
0e2da18081 Fix up the makefiles and some samples.
Add LOCAL_DEX_PREOPT := false to force the samples to build actual apks.

In addition, fix a couple of other small issues:

- TtsEngine didn't have the api level set properly.
- SimpleJNI used a non-ndk library and was using libc++.

Change-Id: I1fd7c187956eed4620049bb746f4d62babcd648a
2016-04-19 14:32:13 -07:00
Dan Albert
d66a831ffc Merge changes from topic 'choreo_ndk'
* changes:
  Add choreographer API to the NDK
  Copy over libandroid symbols from platform 21.
2016-04-14 22:27:52 +00:00
Michael Wright
793e051c0f Add choreographer API to the NDK
Bug: 22865162
Change-Id: I7991795eda6e23369e82c2aaca8c337687b38dc1
2016-04-14 13:22:49 -07:00
Martijn Coenen
6ceb416ca8 Copy over libandroid symbols from platform 21.
Bug: 22865162
Change-Id: I1b0c47a770b9a9149aa90667a0b38eee695fe4f2
2016-04-14 13:22:48 -07:00
Pablo Ceballos
09af15235b Merge "ndk: egl: Add EGL_KHR_mutable_render_buffer" 2016-04-14 17:11:01 +00:00
Pablo Ceballos
ae96f486e3 ndk: egl: Add EGL_KHR_mutable_render_buffer
platform CL: ag/929283

Change-Id: Ied3a0b50538a60ed8a37887ad6bfddecd60d8161
2016-04-13 20:03:51 +00:00
Than McIntosh
7f00068526 Merge "Script to perform USB reset of Android device." 2016-04-12 18:28:45 +00:00
Than McIntosh
6ae324144b Script to perform USB reset of Android device.
Given a serial number, applies correct ioctl()
to reset the USB device with that serial number.
Useful to avoid having to unplug/replug after
flashall + wipe of device.

Change-Id: I7402e1e53cabc19c423ef912a5dc7ade8221b08b
2016-04-12 14:25:27 -04:00
Shinichiro Hamaji
0e8a8a61c7 Merge "Let android_stubs depend on jack-default.args" 2016-04-08 06:47:29 +00:00
Shinichiro Hamaji
a75a596d71 Let android_stubs depend on jack-default.args
Bug: 27954979
Change-Id: I537bd5037a00c4fbf3bc5a6ecd15ea0a81f4b6ce
2016-04-07 19:02:33 +09:00
Pablo Ceballos
ce95b52136 Merge changes If8a072ea,I8fead050
* changes:
  NDK EGL: Build break fix
  Revert "Revert "Merge changes Icc59b133,I71814ffd,Idfdb90b5,Ie3bded59,Icaa93832, ...""
2016-04-06 19:53:14 +00:00
Pablo Ceballos
4eb20b8b0c Merge changes I727a2ca6,Ic3918978
* changes:
  GLES NDK: Build break fix
  Revert "Revert "Merge changes If65b4e6c,If993b7f7""
2016-04-05 17:37:42 +00:00
Sebastien Hertz
f26b07fb57 Merge "Add jack-jacoco-reporter.jar to build tools" 2016-04-05 12:34:23 +00:00
Sebastien Hertz
c0f1caa598 Add jack-jacoco-reporter.jar to build tools
Bug: 27989323
Change-Id: I07a58d4e800866238cf0c721e80099a12fa37233
2016-04-05 09:41:42 +02:00
Pablo Ceballos
a240a81a0e NDK EGL: Build break fix
- Make sure all headers can be included by themselves.

Change-Id: If8a072ea7db5b8c29ee6e0ac4843d26e82988ae5
2016-04-04 15:28:40 -07:00
Pablo Ceballos
b55209b98a Revert "Revert "Merge changes Icc59b133,I71814ffd,Idfdb90b5,Ie3bded59,Icaa93832, ...""
This reverts commit 5a4b526228.
2016-04-04 15:15:46 -07:00
Pablo Ceballos
046cd08f6c GLES NDK: Build break fix
- Make sure all headers can be included by themselves.

Change-Id: I727a2ca632f66c6ad39a0df4cf54d7ffde8116a5
2016-04-04 15:11:30 -07:00
Pablo Ceballos
0d45e80bb5 Revert "Revert "Merge changes If65b4e6c,If993b7f7""
This reverts commit 91e857ab5c.
2016-04-04 15:09:55 -07:00
Dan Albert
a38abd88b1 Merge "Revert "Merge changes If65b4e6c,If993b7f7"" 2016-03-31 18:29:06 +00:00
Dan Albert
23ec3e02ff Merge "Revert "Merge changes Icc59b133,I71814ffd,Idfdb90b5,Ie3bded59,Icaa93832, ..."" 2016-03-31 18:28:23 +00:00
Dan Albert
91e857ab5c Revert "Merge changes If65b4e6c,If993b7f7"
Broke the build.

This reverts commit 615357b952, reversing
changes made to ec4c4548dd.

Change-Id: I00e55e60783cffa9ca8b5a66ba342454e4834b18
2016-03-31 11:27:37 -07:00
Dan Albert
5a4b526228 Revert "Merge changes Icc59b133,I71814ffd,Idfdb90b5,Ie3bded59,Icaa93832, ..."
Broke the build.

This reverts commit bc8899c103, reversing
changes made to 615357b952.

Change-Id: Ibd36bc1df7f7e20cb054c6a64686f4324f2d818c
2016-03-31 11:27:27 -07:00
Pablo Ceballos
bc8899c103 Merge changes Icc59b133,I71814ffd,Idfdb90b5,Ie3bded59,Icaa93832, ...
* changes:
  NDK EGL: Updates to android-24
  NDK EGL: Copy android-23 to android-24
  NDK EGL: Updates to android-23
  NDK EGL: Copy android-21 to android-23
  NDK EGL: Copy android-19 to android-21
  NDK EGL: Updates to android-19
  NDK EGL: Copy android-18 to android-19
  NDK EGL: Updates to android-18
  NDK EGL: Copy android-14 to android-18
  NDK EGL: Updates to android-14
  NDK EGL: copy android-9 to android-14
  NDK EGL: Updates to android-9
2016-03-30 21:58:19 +00:00
Pablo Ceballos
ee60ab1e89 NDK EGL: Updates to android-24
Change-Id: Icc59b13372198a264be8faa9eb60875faab4c78a
2016-03-30 13:32:16 -07:00
Pablo Ceballos
075224862f NDK EGL: Copy android-23 to android-24
Change-Id: I71814ffdbefc486fa9eafb0d0d3ce6df546a7937
2016-03-30 13:32:03 -07:00
Pablo Ceballos
51483303ef NDK EGL: Updates to android-23
Change-Id: Idfdb90b510f5f8e75b0291dac1a5f55f2aaa5c54
2016-03-30 13:31:52 -07:00
Pablo Ceballos
6698b7aba9 NDK EGL: Copy android-21 to android-23
Change-Id: Ie3bded59979f02dea706fa349f6d7b72b2538d1a
2016-03-30 13:31:41 -07:00
Pablo Ceballos
db30c63af6 NDK EGL: Copy android-19 to android-21
Change-Id: Icaa93832c943565ef261a7a493be88491fb3cef3
2016-03-30 13:31:30 -07:00
Pablo Ceballos
d2825aa47f NDK EGL: Updates to android-19
Change-Id: I8019ea991ce9c5dadbbe2b305e051ce30888a031
2016-03-30 13:31:09 -07:00
Pablo Ceballos
c73a7b69d6 NDK EGL: Copy android-18 to android-19
Change-Id: Idc4e7854b667ca7474863a539654af16576faf61
2016-03-30 13:30:37 -07:00
Pablo Ceballos
ec06bcf353 NDK EGL: Updates to android-18
Change-Id: If3103dbf4ca96d8bec130f4475e6d26abbad0402
2016-03-30 13:30:12 -07:00
Pablo Ceballos
cdd52121c1 NDK EGL: Copy android-14 to android-18
Change-Id: I5eb9f2c65af8c0e70b1d4202a3d5f284d200770c
2016-03-30 13:26:38 -07:00
Pablo Ceballos
d3c825f4fb NDK EGL: Updates to android-14
Change-Id: Iaabc5a054e3ef41a14f9e2f1236c100456206a21
2016-03-30 13:24:22 -07:00
Pablo Ceballos
e244e7b0ce NDK EGL: copy android-9 to android-14
Change-Id: Icc426519e28eefd26b4f0790770386b4e95e5586
2016-03-30 13:24:00 -07:00
Pablo Ceballos
b28db537de NDK EGL: Updates to android-9
Change-Id: I1d1784c78b1e00b24403cd6342f411d02e669062
2016-03-30 13:23:11 -07:00
Pablo Ceballos
615357b952 Merge changes If65b4e6c,If993b7f7
* changes:
  NDK GLES: Updates to android-24
  NDK GLES: copy android-21 to android-24
2016-03-30 20:03:17 +00:00
Pablo Ceballos
d9d32bb094 NDK GLES: Updates to android-24
- Add the GLES3.2 symbols and headers

Change-Id: If65b4e6c7ac8db0ff0d1fe7f4883fb1bf2d22e82
2016-03-30 11:25:38 -07:00
Pablo Ceballos
b29233e496 NDK GLES: copy android-21 to android-24
Change-Id: If993b7f747d3510b2e4fa49e8624df04f9842c4a
2016-03-30 11:19:25 -07:00
Josh Gao
ec4c4548dd Merge "Fix adb.py." 2016-03-29 18:36:31 +00:00
Josh Gao
016c18c73d Fix adb.py.
oops

Change-Id: Id3e11ebc89d32f1d0a606047f9b69469fe701098
2016-03-29 11:33:30 -07:00
Josh Gao
5e26cab050 Merge "gdbrunner: decapitalize usage for --adb." 2016-03-29 17:28:56 +00:00
Josh Gao
f3532aedfa gdbrunner: decapitalize usage for --adb.
Change-Id: I36e84e2570d41c0723a35eab9cea329af4987006
2016-03-28 18:38:55 -07:00
Josh Gao
952930ad1c Merge "adb.py: require adb version >= 35 to use shell protocol." 2016-03-28 21:16:18 +00:00
Josh Gao
1d404e6c92 adb.py: require adb version >= 35 to use shell protocol.
Change-Id: I2513db8a88e1a1bd96ce642251882de97ca37df6
2016-03-28 14:10:57 -07:00
Josh Gao
18daa1eaa9 Merge changes I895aacaa,I1a47eb42,I5dcee7c7
* changes:
  gdbrunner: expose adb.split_lines, use it.
  gdbrunner: don't use getppid to name the log file.
  gdbrunner: close the exec script before passing it to gdb.
2016-03-28 19:39:14 +00:00
Josh Gao
7f6e8ddb79 gdbrunner: expose adb.split_lines, use it.
Change-Id: I895aacaababf87c1e82ff5604c028cc475207304
2016-03-28 11:26:03 -07:00
Josh Gao
dc10068c64 gdbrunner: don't use getppid to name the log file.
Windows doesn't really have a concept of process parenthood.

Bug: https://github.com/android-ndk/ndk/issues/46
Change-Id: I1a47eb42a9eb5d94c95136bb73eac1caabb923c7
2016-03-28 11:26:03 -07:00
Josh Gao
a0f62495a4 gdbrunner: close the exec script before passing it to gdb.
Windows won't allow gdb to open to file while we have it open.

Bug: https://github.com/android-ndk/ndk/issues/46
Change-Id: I5dcee7c70a582e94c472d6d09bf79c2616ea76fa
2016-03-28 11:26:02 -07:00
Elliott Hughes
34874d7a86 Merge "Remove yuv420sp2rgb." 2016-03-26 16:09:23 +00:00