third_party/Android.mk enhancements: Use LOCAL_CPPFLAGS

[dneto0]

Use LOCAL_CPPFLAGS instead of LOCAL_CXXFLAGS.

LOCAL_CPPFLAGS is newer and recommended.

[taml]

Hello, I'd like to help with this if possible. I'm pretty new to Android, is this just a case of going through the code and switching any use of LOCAL_CXXFLAGS to LOCAL_CPPFLAGS or is there a bit more to it than that? Thanks

[dneto0]

Yes, it's just making that change in the one Android.mk file. :-)

Real work is in verifying the change. I'd like to test it with the NDK versions r10e and r13.

Here's an example of how I test the build, customized to NDK location and especially how the tree is checked out. (Actually it's a bit of a wonky structure but it works).

#!/bin/bash

export ANDROID_NDK=$HOME/android-ndk-r10e
export SPVTOOLS_LOCAL_PATH=$SRC_TREE/third_party/spirv-tools
export SPVHEADERS_LOCAL_PATH=$SRC_TREE/third_party/spirv-headers

# Allow use of args like -j 30
exec $ANDROID_NDK/ndk-build NDK_APP_OUT=`pwd` -C $SRC_TREE/third_party/shaderc/android_test \
  V=1 \
  SPVTOOLS_LOCAL_PATH=$SPVTOOLS_LOCAL_PATH \
  SPVHEADERS_LOCAL_PATH=$SPVHEADERS_LOCAL_PATH \
  "$@"

If you can make the Android.mk change and verify with the two versions of the NDK that would be grand!

[taml]

Thanks for the information, I've updated the one Android.mk file, but I think the testing is a little out of my depth, so haven't submitted a PR just yet. If there's anything a little more beginner level I can work on, I'd love to help out!

[dneto0]

@taml I hear you. :-) If you're willing to help on another project, I have something in mind in KhronosGroup/SPIRV-Tools. I haven't written it down yet, but it's a nice isolated piece that can be verified on any platform. I'm taking this opportunity to formalize the "help wanted" process and task list in that project. Stay tuned.

[taml]

@dneto0 Yeah sure, I'd definitely be interested in helping out!

[dneto0]

Take a look at KhronosGroup/SPIRV-Tools#502
Should be some Python and C++.
Note that SPIRV-Tools is used as a part of Shaderc so if you've built Shaderc then you've already built SPIRV-Tools.
SPIRV-Tools has its own contributors license agreement.