Commit a550ca9

committed

Aug 25, 2016

Merging master-ndkbuild branch into cmake branch

source code are shared with cmake's copy two-libs and test-libstdc++ are not shared with cmake also consolidated Teapots project into one projects called teapots: Teapot MoreTeapots choregrapher-30fps (has its own ndk-helper code)

1 parent f4b89cb commit a550ca9Copy full SHA for a550ca9

325 files changed

+5216

-5024

lines changed

MoreTeapots
- screenshot.png
Teapot
- app/src/main/cpp/ndk_helper
- gradle/wrapper
  - gradle-wrapper.jar
audio-echo/app
- build.gradle
bitmap-plasma/app
- build.gradle
choreographer-30fps
- .google
  - packaging.yaml
- README.md
- gradle/wrapper
  - gradle-wrapper.jar
- screenshot.png
endless-tunnel/app
- build.gradle
gles3jni/app
- build.gradle
hello-gl2/app
- build.gradle
hello-jni/app
- build.gradle
hello-jniCallback/app
- build.gradle
hello-libs/app
- build.gradle
- src/main/cpp
  - hello-libs.cpp
hello-neon/app
- build.gradle
native-activity/app
- build.gradle
native-audio/app
- build.gradle
native-codec/app
- build.gradle
native-media/app
- build.gradle
native-plasma/app
- build.gradle
other-builds/ndkbuild
- bitmap-plasma
  - app
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
- gles3jni
- hello-gl2
  - app
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
- hello-jni
  - app
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
- hello-libs
  - .google
    - packaging.yaml
  - README.md
  - app
  - build.gradle
  - gen-libs
    - gen_lib.sh
    - gmath
      - Android.mk
      - Application.mk
    - gperf
      - Android.mk
      - Application.mk
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradle.properties
  - gradlew
  - gradlew.bat
  - screenshot.png
  - settings.gradle
- hello-neon
  - app
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
- module-exports
  - README.TXT
  - app/src/main/cpp
    - Android.mk
    - Application.mk
    - bar
      - bar.c
      - bar.h
    - foo
      - foo.c
      - foo.h
    - zoo
      - zoo.c
- native-activity
  - app
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
- native-audio
  - README.md
  - app
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
- native-codec
  - app
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
  - testfile.mp4
- native-media
  - NativeMedia.ts
  - README.txt
  - app
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
- native-plasma
  - app
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
- san-angeles
  - app
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
- teapots
  - build.gradle
  - classic-teapot
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - more-teapots
  - settings.gradle
- test-libstdc++/jni
- two-libs
  - app
    - build.gradle
    - src/main
      - AndroidManifest.xml
      - cpp
        Android.mk
        Application.mk
        first.c
        first.h
        second.c
      - java/com/example/twolibs
        TwoLibs.java
      - res/values
        strings.xml
  - build.gradle
  - gradle/wrapper
    - gradle-wrapper.jar
    - gradle-wrapper.properties
  - gradlew
  - gradlew.bat
  - settings.gradle
san-angeles/app/src/main/cpp
- CMakeLists.txt
sensor-graph/accelerometer
- build.gradle
teapots
- .google
  - packaging.yaml
- README.md
- build.gradle
- choreographer-30fps
  - build.gradle
  - src/main
    - AndroidManifest.xml
    - assets/Shaders
      - ShaderPlain.fsh
      - VS_ShaderPlain.vsh
    - cpp
    - java/com/sample
      - choreographer
        ChoreographerApplication.java
        ChoreographerNativeActivity.java
      - helper
        NDKHelper.java
    - res
      - layout
        widgets.xml
      - mipmap-hdpi
        ic_launcher.png
      - mipmap-mdpi
        ic_launcher.png
      - mipmap-xhdpi
        ic_launcher.png
      - mipmap-xxhdpi
        ic_launcher.png
      - values
        strings.xml
        styles.xml
      - values-v11
        styles.xml
      - values-v14
        styles.xml
- classic-teapot
  - build.gradle
  - src/main
    - AndroidManifest.xml
    - assets/Shaders
      - ShaderPlain.fsh
      - VS_ShaderPlain.vsh
    - cpp
    - java/com/sample
      - helper
        NDKHelper.java
      - teapot
        TeapotApplication.java
        TeapotNativeActivity.java
    - res
      - layout
        widgets.xml
      - mipmap-hdpi
        ic_launcher.png
      - mipmap-mdpi
        ic_launcher.png
      - mipmap-xhdpi
        ic_launcher.png
      - mipmap-xxhdpi
        ic_launcher.png
      - values
        strings.xml
        styles.xml
      - values-v11
        styles.xml
      - values-v14
        styles.xml
- common/ndk_helper
- gradle/wrapper
  - gradle-wrapper.jar
  - gradle-wrapper.properties
- gradlew
- gradlew.bat
- more-teapots
  - build.gradle
  - src/main
    - AndroidManifest.xml
    - assets/Shaders
    - cpp
    - java/com/sample
      - helper
        NDKHelper.java
      - moreteapots
        MoreTeapotsApplication.java
        MoreTeapotsNativeActivity.java
    - res
      - layout
        widgets.xml
      - mipmap-hdpi
        ic_launcher.png
      - mipmap-mdpi
        ic_launcher.png
      - mipmap-xhdpi
        ic_launcher.png
      - mipmap-xxhdpi
        ic_launcher.png
      - values
        strings.xml
        styles.xml
      - values-v11
        styles.xml
      - values-v14
        styles.xml
- screenshot.png
- settings.gradle
webp/view
- build.gradle

325 files changed

+5216

-5024

lines changed

`‎MoreTeapots/screenshot.png`

-837 KB

Binary file not shown.

`‎Teapot/app/src/main/cpp/ndk_helper/GLContext.cpp`

-240

This file was deleted.

Comments

(0)

Please sign in to comment.