make/common/NativeCompilation.gmk

*** 234,246 ****
    ifeq ($$(findstring $$($1_OBJ), $$($$($1_BASE)_OBJS_SO_FAR)), )
      $$($1_BASE)_OBJS_SO_FAR += $$($1_OBJ)
      # This is the definite source file to use for $1_FILENAME.
      $1_SRC_FILE := $$($1_FILE)
  
!     ifneq ($$($1_DISABLE_THIS_FILE_DEFINE), true)
        $1_THIS_FILE = -DTHIS_FILE='"$$($1_FILENAME)"'
      endif
  
      ifeq ($$($1_OPTIMIZATION), )
        $1_OPT_CFLAGS := $$($$($1_BASE)_OPT_CFLAGS)
        $1_OPT_CXXFLAGS := $$($$($1_BASE)_OPT_CXXFLAGS)
      else
--- 234,248 ----
    ifeq ($$(findstring $$($1_OBJ), $$($$($1_BASE)_OBJS_SO_FAR)), )
      $$($1_BASE)_OBJS_SO_FAR += $$($1_OBJ)
      # This is the definite source file to use for $1_FILENAME.
      $1_SRC_FILE := $$($1_FILE)
  
!     ifneq ($$($1_DEFINE_THIS_FILE), false)
!       ifneq ($$($$($1_BASE)_DEFINE_THIS_FILE), false)
          $1_THIS_FILE = -DTHIS_FILE='"$$($1_FILENAME)"'
        endif
+     endif
  
      ifeq ($$($1_OPTIMIZATION), )
        $1_OPT_CFLAGS := $$($$($1_BASE)_OPT_CFLAGS)
        $1_OPT_CXXFLAGS := $$($$($1_BASE)_OPT_CXXFLAGS)
      else
*** 420,429 ****
--- 422,432 ----
  #   ZIP_EXTERNAL_DEBUG_SYMBOLS Set to false to override global setting of debug symbol
  #       zipping
  #   STRIPFLAGS Optionally change the flags given to the strip command
  #   PRECOMPILED_HEADER Header file to use as precompiled header
  #   PRECOMPILED_HEADER_EXCLUDE List of source files that should not use PCH
+ #   DEFINE_THIS_FILE Set to false to not set the THIS_FILE preprocessor macro
  #
  # After being called, some variables are exported from this macro, all prefixed
  # with parameter 1 followed by a '_':
  #   TARGET The library or executable created by the macro
  #   TARGET_DEPS All prerequisites for the target calculated by the macro
*** 694,704 ****
  
          $$(eval $$(call SetupCompileNativeFile, $1_$$(notdir $$($1_GENERATED_PCH_SRC)), \
              FILE := $$($1_GENERATED_PCH_SRC), \
              BASE := $1, \
              EXTRA_CXXFLAGS := -Fp$$($1_PCH_FILE) -Yc$$(notdir $$($1_PRECOMPILED_HEADER)), \
!             DISABLE_THIS_FILE_DEFINE := true, \
          ))
  
          $1_USE_PCH_FLAGS := \
              -Fp$$($1_PCH_FILE) -Yu$$(notdir $$($1_PRECOMPILED_HEADER))
  
--- 697,707 ----
  
          $$(eval $$(call SetupCompileNativeFile, $1_$$(notdir $$($1_GENERATED_PCH_SRC)), \
              FILE := $$($1_GENERATED_PCH_SRC), \
              BASE := $1, \
              EXTRA_CXXFLAGS := -Fp$$($1_PCH_FILE) -Yc$$(notdir $$($1_PRECOMPILED_HEADER)), \
!             DEFINE_THIS_FILE := false, \
          ))
  
          $1_USE_PCH_FLAGS := \
              -Fp$$($1_PCH_FILE) -Yu$$(notdir $$($1_PRECOMPILED_HEADER))