commit 46f7708cd248389911fef736a2d33b56cd9bb30c
author Android Chromium Automerger <chromium-automerger@android> Thu Nov 14 16:29:05 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Thu Nov 14 16:29:05 2013 +0000
tree 3b68da72c10348c19aaf3b3fc2f46c1d3ac8ea25
parent 02820a4d2c9a8c336e9396b88d6aad0cd0aa4ebe

Update makefiles after merge of Chromium at 235157

This commit was generated by merge_from_chromium.py.

Change-Id: I5c13d614d32c6515cc9e43851082854a806f8ebc

ots.target.linux-arm.mk

diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 0cd378c..1ef939e 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -102,6 +102,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_MANAGED_USERS=1' \
 	'-D__STDC_CONSTANT_MACROS' \
 	'-D__STDC_FORMAT_MACROS' \
 	'-DANDROID' \
@@ -184,6 +185,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_MANAGED_USERS=1' \
 	'-D__STDC_CONSTANT_MACROS' \
 	'-D__STDC_FORMAT_MACROS' \
 	'-DANDROID' \