diff options
| author | Andy McFadden <fadden@android.com> | 2010-09-30 14:02:54 -0700 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2010-09-30 15:15:32 -0700 |
| commit | d8b5f50d0c6c9a0ce157e89df4ee1e8eb8b334c3 (patch) | |
| tree | 6eeec1d0e2739d802fc5f3b8455bb403a240f57e /libdex/OptInvocation.h | |
| parent | f45b6cbed6ce7cb6a38746b5abe0213263106a71 (diff) | |
| download | android_dalvik-d8b5f50d0c6c9a0ce157e89df4ee1e8eb8b334c3.tar.gz android_dalvik-d8b5f50d0c6c9a0ce157e89df4ee1e8eb8b334c3.tar.bz2 android_dalvik-d8b5f50d0c6c9a0ce157e89df4ee1e8eb8b334c3.zip | |
Correct dexopt for uniprocessors.
The SMP flag was defaulting to "true" for dexopt, even on uniprocessors.
With this change the VM now has three choices: dexopt for SMP, dexopt
for uniprocessor, or dexopt for current system. The last is used for
just-in-time dexopt (used by -eng and -userdebug builds on bootstrap DEX
files) and installd dexopt (used for apps on all builds).
The dexopt used by the build system during -user builds will either be
explicitly SMP or explicitly uniprocessor, since "current system" has
no meaning when you're cross-dexopting.
Also, unified the dexopt control flags into a single enum.
(cherry-pick from dalvik-dev)
Change-Id: Id1d9c548ca8567585a28ef9ee911cc2ac6b116dd
Diffstat (limited to 'libdex/OptInvocation.h')
| -rw-r--r-- | libdex/OptInvocation.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libdex/OptInvocation.h b/libdex/OptInvocation.h index d9708caed..0352eb423 100644 --- a/libdex/OptInvocation.h +++ b/libdex/OptInvocation.h @@ -13,20 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /* * Utility functions related to "dexopt". */ #ifndef _LIBDEX_OPTINVOCATION #define _LIBDEX_OPTINVOCATION -#include <stdint.h> -#include <unistd.h> - #ifdef __cplusplus extern "C" { #endif - /* * Utility routines, used by the VM. */ @@ -34,15 +31,6 @@ char* dexOptGenerateCacheFileName(const char* fileName, const char* subFileName); int dexOptCreateEmptyHeader(int fd); -/* some flags that get passed through to "dexopt" command */ -#define DEXOPT_OPT_ENABLED (1) -#define DEXOPT_OPT_ALL (1 << 1) -#define DEXOPT_VERIFY_ENABLED (1 << 2) -#define DEXOPT_VERIFY_ALL (1 << 3) -#define DEXOPT_IS_BOOTSTRAP (1 << 4) -#define DEXOPT_GEN_REGISTER_MAP (1 << 5) - - #ifdef __cplusplus }; #endif |