Rollback of commit 7841a6ab100fc35a67600f1ce1a70d293c51350e.

*** Reason for rollback ***

breaks []

*** Original change description ***

Move the command line arguments for C++ preprocessor defines to a feature.

This required a few assorted changes:

- The LIPO compilation context is not merged anymore. Include paths for auxiliary files are apparently taken from the profile files, so it is not necessary.
- The FDO build stamp is not special-cased anymore, it is treated as a preprocessor define like any other.
- When compiling a .pcm file, use interfaceContext instead of the regular context when setting up the build variables. Th...

***

--
MOS_MIGRATED_REVID=122823591

1 files changed, 1 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
index eca4a6d189..074900356c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
@@ -167,17 +167,12 @@ public class CppRuleClasses {
   /**
    * A string constant for the PIC feature.
    *
-   * <p>If this feature is active (currently it cannot be switched off) and PIC compilation is
+   * If this feature is active (currently it cannot be switched off) and PIC compilation is
    * requested, the "pic" build variable will be defined with an empty string as its value.
    */
   public static final String PIC = "pic";
 
   /**
-   * A string constant for the feature the represents preprocessor defines.
-   */
-  public static final String PREPROCESSOR_DEFINES = "preprocessor_defines";
-
-  /**
    * A string constant for the include_paths feature.
    */
   public static final String INCLUDE_PATHS = "include_paths";