diff options
| author | Dan Albert <danalbert@google.com> | 2019-06-26 16:14:23 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-09-25 11:24:08 -0700 |
| commit | 0b88c40307a7ca1492419f90cd1a9de578bad2b8 (patch) | |
| tree | a910152d09240309c78f9800a860265fcef71841 /build | |
| parent | 3b8bff7a58942bba9d10d3c3ae5171ea83619c49 (diff) | |
| download | ndk-0b88c40307a7ca1492419f90cd1a9de578bad2b8.tar.gz | |
Allow externally specified import paths.
Gradle needs to be able to specify a dependency import path for Prefab
modules. Add NDK_GRADLE_INJECTED_IMPORT_PATH to support this.
This could instead be a more generic NDK_ADDITIONAL_IMPORT_PATHS, but
that's probably of limited use since Gradle will clobber the user's
flags with its own.
Test: ./run_tests.py --rebuild
Bug: https://github.com/android-ndk/ndk/issues/916
Change-Id: I18f9ff2830846d9ea63130d6949c9d199b72db60
Diffstat (limited to 'build')
| -rw-r--r-- | build/core/setup-imports.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/core/setup-imports.mk b/build/core/setup-imports.mk index 96fc1d599..f7b27747c 100644 --- a/build/core/setup-imports.mk +++ b/build/core/setup-imports.mk @@ -34,3 +34,9 @@ $(foreach __path,$(subst $(HOST_DIRSEP),$(space),$(NDK_MODULE_PATH)),\ ) $(call import-add-path-optional,$(NDK_ROOT)/sources) $(call import-add-path-optional,$(NDK_ROOT)/../development/ndk/sources) + +# Gradle can inject its own import paths to expose other ndk-build modules to +# ndk-build (such as those generate by Prefab). +ifdef NDK_GRADLE_INJECTED_IMPORT_PATH + $(call import-add-path,$(NDK_GRADLE_INJECTED_IMPORT_PATH)) +endif
\ No newline at end of file |