diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-03-18 11:33:14 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-03-18 11:33:14 -0700 |
| commit | 2a73de7b21a89aa2ba4c254d28658b49793425b2 (patch) | |
| tree | ded5bcd581464b4174d81c373044b6d36eee58d2 /tools/aidl/options.h | |
| parent | 42e48026b21a962e5bf40344d738665ecbd9d74d (diff) | |
| parent | ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 (diff) | |
| download | frameworks_base-2a73de7b21a89aa2ba4c254d28658b49793425b2.zip frameworks_base-2a73de7b21a89aa2ba4c254d28658b49793425b2.tar.gz frameworks_base-2a73de7b21a89aa2ba4c254d28658b49793425b2.tar.bz2 | |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
Diffstat (limited to 'tools/aidl/options.h')
| -rw-r--r-- | tools/aidl/options.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aidl/options.h b/tools/aidl/options.h index e7e62ec..d88d988 100644 --- a/tools/aidl/options.h +++ b/tools/aidl/options.h @@ -21,6 +21,7 @@ struct Options vector<string> preprocessedFiles; string inputFileName; string outputFileName; + string outputBaseFolder; string depFileName; vector<string> filesToPreprocess; |