Skip to content

Fix simple build warning with NDK r22/23 #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2021
Merged

Fix simple build warning with NDK r22/23 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions tutorial01_load_vulkan/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
compileSdkVersion 30
ndkVersion '22.0.7026061'

defaultConfig {
applicationId "com.google.vulkan.tutorials.one"
minSdkVersion 24
targetSdkVersion 24
targetSdkVersion 30
versionCode 1
versionName "0.0.1"
externalNativeBuild {
Expand All @@ -16,19 +17,7 @@ android {
}
}
}
externalNativeBuild {
cmake {
path 'src/main/jni/CMakeLists.txt'
}
}
buildTypes {
release {
minifyEnabled = false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
externalNativeBuild.cmake.path = 'src/main/jni/CMakeLists.txt'

buildTypes.release.minifyEnabled = false
}
17 changes: 0 additions & 17 deletions tutorial01_load_vulkan/app/proguard-rules.pro
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions tutorial01_load_vulkan/app/src/main/jni/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ bool initialize(android_app* app) {
VkApplicationInfo appInfo = {
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
.pNext = nullptr,
.apiVersion = VK_MAKE_VERSION(1, 0, 0),
.applicationVersion = VK_MAKE_VERSION(1, 0, 0),
.engineVersion = VK_MAKE_VERSION(1, 0, 0),
.pApplicationName = "tutorial01_load_vulkan",
.applicationVersion = VK_MAKE_VERSION(1, 0, 0),
.pEngineName = "tutorial",
.engineVersion = VK_MAKE_VERSION(1, 0, 0),
.apiVersion = VK_MAKE_VERSION(1, 1, 0),
};

// prepare necessary extensions: Vulkan on Android need these to function
Expand All @@ -94,10 +94,10 @@ bool initialize(android_app* app) {
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
.pNext = nullptr,
.pApplicationInfo = &appInfo,
.enabledExtensionCount = static_cast<uint32_t>(instanceExt.size()),
.ppEnabledExtensionNames = instanceExt.data(),
.enabledLayerCount = 0,
.ppEnabledLayerNames = nullptr,
.enabledExtensionCount = static_cast<uint32_t>(instanceExt.size()),
.ppEnabledExtensionNames = instanceExt.data(),
};
CALL_VK(vkCreateInstance(&instanceCreateInfo, nullptr, &tutorialInstance));

Expand Down Expand Up @@ -176,8 +176,8 @@ bool initialize(android_app* app) {
.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
.pNext = nullptr,
.flags = 0,
.queueCount = 1,
.queueFamilyIndex = queueFamilyIndex,
.queueCount = 1,
.pQueuePriorities = priorities,
};

Expand Down
2 changes: 1 addition & 1 deletion tutorial01_load_vulkan/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:4.1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
18 changes: 0 additions & 18 deletions tutorial01_load_vulkan/gradle.properties
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions tutorial01_load_vulkan/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jan 13 14:43:57 PST 2020
#Wed Apr 28 22:22:10 PDT 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
48 changes: 22 additions & 26 deletions tutorial03_traceable_layers/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,33 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
compileSdkVersion 30
ndkVersion '22.0.7026061'

defaultConfig {
applicationId "com.google.vulkan.tutorials.three"
minSdkVersion 24
targetSdkVersion 24
versionCode = 1
versionName = "0.0.1"
ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
externalNativeBuild.cmake.arguments '-DANDROID_TOOLCHAIN=clang',
defaultConfig {
applicationId "com.google.vulkan.tutorials.three"
minSdkVersion 24
targetSdkVersion 30
versionCode = 1
versionName = "0.0.1"
ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
externalNativeBuild.cmake.arguments '-DANDROID_TOOLCHAIN=clang',
'-DANDROID_STL=c++_static'
}
}

externalNativeBuild.cmake.path 'CMakeLists.txt'
externalNativeBuild.cmake.path 'CMakeLists.txt'

sourceSets {
main {
dependencies {
project ':layerlib'
}
sourceSets {
main {
dependencies {
// project ':layerlib'
}

}
buildTypes {
release {
minifyEnabled = false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}

buildTypes {
release {
minifyEnabled = false
}
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':layerlib')
}
}
17 changes: 0 additions & 17 deletions tutorial03_traceable_layers/app/proguard-rules.pro
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions tutorial03_traceable_layers/app/src/main/jni/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ bool initialize(android_app* app) {
VkApplicationInfo appInfo = {
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
.pNext = nullptr,
.apiVersion = VK_MAKE_VERSION(1, 0, 0),
.applicationVersion = VK_MAKE_VERSION(1, 0, 0),
.engineVersion = VK_MAKE_VERSION(1, 0, 0),
.pApplicationName = "tutorial03_traceable_layers",
.applicationVersion = VK_MAKE_VERSION(1, 0, 0),
.pEngineName = "tutorial",
.engineVersion = VK_MAKE_VERSION(1, 0, 0),
.apiVersion = VK_MAKE_VERSION(1, 1, 0),
};

// prepare debug and layer objects
Expand All @@ -94,12 +94,12 @@ bool initialize(android_app* app) {
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
.pNext = nullptr,
.pApplicationInfo = &appInfo,
.enabledExtensionCount = layerAndExt.InstExtCount(),
.ppEnabledExtensionNames =
static_cast<const char* const*>(layerAndExt.InstExtNames()),
.enabledLayerCount = layerAndExt.InstLayerCount(),
.ppEnabledLayerNames =
static_cast<const char* const*>(layerAndExt.InstLayerNames()),
.enabledExtensionCount = layerAndExt.InstExtCount(),
.ppEnabledExtensionNames =
static_cast<const char* const*>(layerAndExt.InstExtNames()),
};
CALL_VK(vkCreateInstance(&instanceCreateInfo, nullptr, &tutorialInstance));

Expand Down Expand Up @@ -183,8 +183,8 @@ bool initialize(android_app* app) {
.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
.pNext = nullptr,
.flags = 0,
.queueCount = 1,
.queueFamilyIndex = queueFamilyIndex,
.queueCount = 1,
// Send nullptr for queue priority so debug extension could
// catch the bug and call back app's debug function
.pQueuePriorities = nullptr, // priorities,
Expand Down
2 changes: 1 addition & 1 deletion tutorial03_traceable_layers/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:4.1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
18 changes: 0 additions & 18 deletions tutorial03_traceable_layers/gradle.properties
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions tutorial03_traceable_layers/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jan 13 14:54:43 PST 2020
#Wed Apr 28 22:36:34 PDT 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
2 changes: 1 addition & 1 deletion tutorial03_traceable_layers/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':layerlib'
include ':app'
22 changes: 6 additions & 16 deletions tutorial04_first_window/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
compileSdkVersion 30
ndkVersion '22.0.7026061'

defaultConfig {
applicationId "com.google.vulkan.tutorials.four"
minSdkVersion 24
targetSdkVersion 24
targetSdkVersion 30
versionCode 1
versionName "0.0.1"
externalNativeBuild {
Expand All @@ -17,19 +18,8 @@ android {
}
}

externalNativeBuild {
cmake {
path 'CMakeLists.txt'
}
}
buildTypes {
release {
minifyEnabled = false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
}
externalNativeBuild.cmake.version = '3.10.2'
externalNativeBuild.cmake.path = 'CMakeLists.txt'

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
buildTypes.release.minifyEnabled=false
}
17 changes: 0 additions & 17 deletions tutorial04_first_window/app/proguard-rules.pro
View file
Open in desktop

This file was deleted.

Loading