[login_manager] Code to add the owner to the whitelist in a device policy

Makefile

 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 CXX ?= g++
 CXXFLAGS ?= -Wall -Werror -g
 CXXFLAGS += -DOS_CHROMEOS
 PKG_CONFIG ?= pkg-config
 
 BASE_LIBS = -lpthread -lrt -lchromeos -lbootstat -levent -lprotobuf-lite -lbase
 LIBS = $(BASE_LIBS)
 TEST_LIBS = $(BASE_LIBS)
 INCLUDE_DIRS = -I.. $(shell $(PKG_CONFIG) --cflags dbus-1 dbus-glib-1 glib-2.0 \
         gdk-2.0 gtk+-2.0 nss)
 LIB_DIRS = $(shell $(PKG_CONFIG) --libs dbus-1 dbus-glib-1 glib-2.0 gdk-2.0 \
         gtk+-2.0 nss)
 
 BINDINGS = bindings
 
 DBUS_SOURCE = session_manager.xml
 DBUS_SERVER = $(BINDINGS)/server.h
 DBUS_CLIENT = $(BINDINGS)/client.h
 
 PROTO_PATH = $(ROOT)/usr/include/proto
-PROTO_DEFS = $(PROTO_PATH)/device_management_backend.proto
-PROTO_BINDINGS = $(BINDINGS)/device_management_backend.pb.cc
+PROTO_DEFS = $(PROTO_PATH)/device_management_backend.proto \
+        $(PROTO_PATH)/chrome_device_policy.proto

[gauravsh, 2011/04/08 04:58:49]

nit: put these in alpha order? same for the additions below.

[Chris Masone, 2011/04/08 05:57:41]

Done.

+PROTO_BINDINGS = $(BINDINGS)/device_management_backend.pb.cc \
+         $(BINDINGS)/chrome_device_policy.pb.cc
 PROTO_HEADERS = $(patsubst %.cc,%.h,$(PROTO_BINDINGS))
-PROTO_OBJS = $(BINDINGS)/device_management_backend.pb.o
+PROTO_OBJS = $(BINDINGS)/device_management_backend.pb.o \
+         $(BINDINGS)/chrome_device_policy.pb.o
 
 COMMON_OBJS = child_job.o interface.o nss_util.o owner_key.o \
         owner_key_loss_mitigator.o pref_store.o system_utils.o \
         upstart_signal_emitter.o wipe_mitigator.o \
         session_manager_service.o device_policy.o $(PROTO_OBJS)
 
 KEYGEN_BIN = keygen
 KEYGEN_OBJS = keygen.o nss_util.o owner_key.o system_utils.o
 
 SESSION_BIN = session_manager
@@ skipping 39 matching lines @@
 
 $(DBUS_CLIENT): $(BINDINGS) $(DBUS_SOURCE)
         dbus-binding-tool --mode=glib-client \
          --prefix=`basename $(DBUS_SOURCE) .xml` $(DBUS_SOURCE) > $(DBUS_CLIENT)
 
 $(PROTO_BINDINGS): $(BINDINGS) $(PROTO_DEFS)
         protoc --proto_path=$(PROTO_PATH) --cpp_out=$(BINDINGS) $(PROTO_DEFS)
 
 clean:
         rm -rf *.o $(KEYGEN_BIN) $(SESSION_BIN) $(TEST_BIN) $(BINDINGS)