Permalink
Commits on May 23, 2016
  1. Merge branch 'google-merge-r11'

    # Conflicts:
    #	ndk/samples/hello-neon/jni/Android.mk
    zuav committed May 23, 2016
Commits on May 20, 2016
  1. [ndk][samples][hello-neon] Enable NEON for clang-x86/x86_64

    Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
    dmcrystax committed May 20, 2016
Commits on May 7, 2016
  1. Use <endian.h> instead of <sys/endian.h> in byteswap.h

    Otherwise crystax-issue876-swapNN test fails.
    zuav committed May 7, 2016
Commits on Apr 28, 2016
  1. Include <limits.h> for PAGE_SIZE

    zuav committed Apr 28, 2016
Commits on Apr 26, 2016
  1. [ndk][samples] Get rid of STLport

    Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
    dmcrystax committed Apr 26, 2016
Commits on Apr 7, 2016
  1. Merge remote-tracking branch 'google/master' into google-merge-r11

     Conflicts:
    	ndk/platforms/android-14/samples/native-media/src/com/example/nativemedia/NativeMedia.java
    	ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotApplication.java
    	ndk/platforms/android-18/samples/MoreTeapots/src/com/sample/moreteapots/MoreTeapotsApplication.java
    	ndk/platforms/android-18/samples/gles3jni/AndroidManifest-18.xml
    	ndk/platforms/android-18/samples/gles3jni/jni/Application.mk
    	ndk/platforms/android-18/samples/gles3jni/jni/RendererES2.cpp
    	ndk/platforms/android-18/samples/gles3jni/jni/RendererES3.cpp
    	ndk/platforms/android-18/samples/gles3jni/jni/gles3jni.cpp
    	ndk/platforms/android-21/include/sys/user.h
    	ndk/platforms/android-21/samples/native-codec/src/com/example/nativecodec/NativeCodec.java
    	ndk/platforms/android-4/samples/san-angeles/src/com/example/SanAngeles/DemoActivity.java
    	ndk/platforms/android-8/samples/bitmap-plasma/src/com/example/plasma/Plasma.java
    	ndk/platforms/android-9/samples/native-activity/jni/Application.mk
    	ndk/platforms/android-9/samples/native-audio/src/com/example/nativeaudio/NativeAudio.java
    	ndk/platforms/android-9/samples/native-plasma/jni/Application.mk
    	ndk/samples/hello-jni/src/com/example/hellojni/HelloJni.java
    	ndk/samples/hello-neon/jni/Android.mk
    	ndk/samples/hello-neon/src/com/example/neon/HelloNeon.java
    	ndk/samples/two-libs/src/com/example/twolibs/TwoLibs.java
    	samples/ReceiveShareDemo/AndroidManifest.xml
    	samples/SupportDesignDemos/src/com/example/android/support/design/widget/AppBarLayoutToolbarCollapseThenPin.java
    	samples/SupportDesignDemos/src/com/example/android/support/design/widget/AppBarLayoutToolbarParallaxOverlapContent.java
    zuav committed Apr 7, 2016
Commits on Apr 5, 2016
  1. Merge changes I727a2ca6,Ic3918978

    * changes:
      GLES NDK: Build break fix
      Revert "Revert "Merge changes If65b4e6c,If993b7f7""
    Pablo Ceballos committed with Gerrit Code Review Apr 5, 2016
  2. Merge "Add jack-jacoco-reporter.jar to build tools"

    Sebastien Hertz committed with Gerrit Code Review Apr 5, 2016
  3. Add jack-jacoco-reporter.jar to build tools

    Bug: 27989323
    Change-Id: I07a58d4e800866238cf0c721e80099a12fa37233
    Sebastien Hertz committed Apr 4, 2016
Commits on Apr 4, 2016
  1. GLES NDK: Build break fix

    - Make sure all headers can be included by themselves.
    
    Change-Id: I727a2ca632f66c6ad39a0df4cf54d7ffde8116a5
    Pablo Ceballos committed Apr 4, 2016
  2. Revert "Revert "Merge changes If65b4e6c,If993b7f7""

    This reverts commit 91e857a.
    Pablo Ceballos committed Apr 4, 2016
Commits on Mar 31, 2016
  1. Merge "Revert "Merge changes If65b4e6c,If993b7f7""

    DanAlbert committed with Gerrit Code Review Mar 31, 2016
  2. Merge "Revert "Merge changes Icc59b133,I71814ffd,Idfdb90b5,Ie3bded59,…

    …Icaa93832, ...""
    DanAlbert committed with Gerrit Code Review Mar 31, 2016
  3. Revert "Merge changes If65b4e6c,If993b7f7"

    Broke the build.
    
    This reverts commit 615357b, reversing
    changes made to ec4c454.
    
    Change-Id: I00e55e60783cffa9ca8b5a66ba342454e4834b18
    DanAlbert committed Mar 31, 2016
  4. Revert "Merge changes Icc59b133,I71814ffd,Idfdb90b5,Ie3bded59,Icaa938…

    …32, ..."
    
    Broke the build.
    
    This reverts commit bc8899c, reversing
    changes made to 615357b.
    
    Change-Id: Ibd36bc1df7f7e20cb054c6a64686f4324f2d818c
    DanAlbert committed Mar 31, 2016
Commits on Mar 30, 2016
  1. 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
    Pablo Ceballos committed with Gerrit Code Review Mar 30, 2016
  2. NDK EGL: Updates to android-24

    Change-Id: Icc59b13372198a264be8faa9eb60875faab4c78a
    Pablo Ceballos committed Mar 29, 2016
  3. NDK EGL: Copy android-23 to android-24

    Change-Id: I71814ffdbefc486fa9eafb0d0d3ce6df546a7937
    Pablo Ceballos committed Mar 29, 2016
  4. NDK EGL: Updates to android-23

    Change-Id: Idfdb90b510f5f8e75b0291dac1a5f55f2aaa5c54
    Pablo Ceballos committed Mar 29, 2016
  5. NDK EGL: Copy android-21 to android-23

    Change-Id: Ie3bded59979f02dea706fa349f6d7b72b2538d1a
    Pablo Ceballos committed Mar 29, 2016
  6. NDK EGL: Copy android-19 to android-21

    Change-Id: Icaa93832c943565ef261a7a493be88491fb3cef3
    Pablo Ceballos committed Mar 29, 2016
  7. NDK EGL: Updates to android-19

    Change-Id: I8019ea991ce9c5dadbbe2b305e051ce30888a031
    Pablo Ceballos committed Mar 29, 2016
  8. NDK EGL: Copy android-18 to android-19

    Change-Id: Idc4e7854b667ca7474863a539654af16576faf61
    Pablo Ceballos committed Mar 29, 2016
  9. NDK EGL: Updates to android-18

    Change-Id: If3103dbf4ca96d8bec130f4475e6d26abbad0402
    Pablo Ceballos committed Mar 29, 2016
  10. NDK EGL: Copy android-14 to android-18

    Change-Id: I5eb9f2c65af8c0e70b1d4202a3d5f284d200770c
    Pablo Ceballos committed Mar 29, 2016
  11. NDK EGL: Updates to android-14

    Change-Id: Iaabc5a054e3ef41a14f9e2f1236c100456206a21
    Pablo Ceballos committed Mar 29, 2016
  12. NDK EGL: copy android-9 to android-14

    Change-Id: Icc426519e28eefd26b4f0790770386b4e95e5586
    Pablo Ceballos committed Mar 29, 2016
  13. NDK EGL: Updates to android-9

    Change-Id: I1d1784c78b1e00b24403cd6342f411d02e669062
    Pablo Ceballos committed Mar 30, 2016
  14. Merge changes If65b4e6c,If993b7f7

    * changes:
      NDK GLES: Updates to android-24
      NDK GLES: copy android-21 to android-24
    Pablo Ceballos committed with Gerrit Code Review Mar 30, 2016
  15. NDK GLES: Updates to android-24

    - Add the GLES3.2 symbols and headers
    
    Change-Id: If65b4e6c7ac8db0ff0d1fe7f4883fb1bf2d22e82
    Pablo Ceballos committed Mar 25, 2016
  16. NDK GLES: copy android-21 to android-24

    Change-Id: If993b7f747d3510b2e4fa49e8624df04f9842c4a
    Pablo Ceballos committed Mar 30, 2016
Commits on Mar 29, 2016
  1. Merge "Fix adb.py."

    jmgao committed with Gerrit Code Review Mar 29, 2016
  2. Fix adb.py.

    oops
    
    Change-Id: Id3e11ebc89d32f1d0a606047f9b69469fe701098
    jmgao committed Mar 29, 2016
  3. Merge "gdbrunner: decapitalize usage for --adb."

    jmgao committed with Gerrit Code Review Mar 29, 2016