mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
James Ide
df653a9dc2
Summary: The Android makefiles had hard-coded paths to hermes-engine, sometimes looking in `node_modules` and other times looking in `..`. This commit implements the Node module resolution algorithm (see common.mk), which handles both of these cases and also looks further up the root if necessary, handling the case when the `hermes-engine` npm package is hoisted. This commit does three things: - Defines `find-node-module` and uses it in the makefiles to find `hermes-engine` - Removes the unused `/path/to/hermes-engine/include` paths since this directory does not exist and should be `/path/to/hermes-engine/android/include` (`android`) - Moves the definition of `REACT_NATIVE` in the makefiles to the top. It was defined after every `$(CLEAR_VARS)` invocation but was not actually cleared anyway. `$(CLEAR_VARS)` resets only `LOCAL_*` variables in this list: https://android.googlesource.com/platform/build/+/7dc45a8/core/clear_vars.mk ## Changelog [Internal] [Changed] - Android Makefiles look for hermes-engine using Node's module resolution algorithm Pull Request resolved: https://github.com/facebook/react-native/pull/26820 Test Plan: Run `./gradlew :ReactAndroid:installArchives`, which requires the hermes-engine paths to be correct in order to find the headers. Differential Revision: D17923671 Pulled By: cpojer fbshipit-source-id: 9238b8718a94080db1abbba6375a6a1d484c871d
30 lines
1.0 KiB
Makefile
30 lines
1.0 KiB
Makefile
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
#
|
|
# This source code is licensed under the MIT license found in the
|
|
# LICENSE file in the root directory of this source tree.
|
|
|
|
##
|
|
# Returns the absolute path to the specified npm package, searching from the
|
|
# given base directory. This function uses Node's module resolution algorithm
|
|
# searching "node_modules" in the base directory and its ancestors. If no
|
|
# matching package is found, this function returns an empty string.
|
|
#
|
|
# The first argument to this function is the base directory from which to begin
|
|
# searching. The second argument is the name of the npm package.
|
|
#
|
|
# Ex: $(call find-node-module,$(LOCAL_PATH),hermes-engine)
|
|
###
|
|
define find-node-module
|
|
$(strip \
|
|
$(eval _base := $(strip $(1))) \
|
|
$(eval _package := $(strip $(2))) \
|
|
$(eval _candidate := $(abspath $(_base)/node_modules/$(_package))) \
|
|
$(if $(realpath $(_candidate)), \
|
|
$(_candidate), \
|
|
$(if $(_base), \
|
|
$(call find-node-module,$(patsubst %/,%,$(dir $(_base))),$(_package)) \
|
|
) \
|
|
) \
|
|
)
|
|
endef
|